Commit Graph

60 Commits

Author SHA1 Message Date
Pierre Schmitz 7037948b65 Add simple function to sign packages
Set SIGNPKG to y in makepkg.conf to enable signing.
2011-04-11 18:26:11 +02:00
Pierre Schmitz 7e3013b2ae Fix rsync call; quotes wont work here 2011-04-08 12:24:25 +02:00
Dan McGee c16e7c25c9 commitpkg: upload signatures if available
Signed-off-by: Dan McGee <dan@archlinux.org>
Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
2011-04-02 00:26:33 +02:00
Dan McGee c955ecf35d commitpkg: upload all files at the same time
Batch them up using a bash array and then pass them all to a single
invocation of rsync.

Signed-off-by: Dan McGee <dan@archlinux.org>
Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
2011-04-02 00:26:33 +02:00
Dan McGee 160e936bba commitpkg: add '-y' to rsyncopts
This allows uploads to possibly be smaller if a similar file exists
nearby without the same name. Unlikely in most cases, but we might as
well take advantage if they do exist:

Signed-off-by: Dan McGee <dan@archlinux.org>
Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
2011-04-02 00:26:33 +02:00
Dan McGee 69f9e64aa3 commitpkg: move all rsync opts to rsyncopts var
Signed-off-by: Dan McGee <dan@archlinux.org>
Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
2011-04-02 00:26:33 +02:00
Dan McGee 71efb148df commitpkg: make repo/server selection more modular
This gets rid of the ever-expanding conditional we had before and
replaces it with two case statements.

The first handles the command name. If it ends with 'pkg', we treat the
entire first part of the reponame, unless of course 'commitpkg' was
called directly. This allows one to add new symlinks such as
'gnome-unstablepkg'.

The second handles the server. Well-known repositories are listed and
passed to the appropriate server. All unusual repos are assumed to live
on gerolde and sent that direction.

Signed-off-by: Dan McGee <dan@archlinux.org>
Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
2011-04-02 00:26:33 +02:00
Rémy Oudompheng f01097f22c Don't prefix package name with './' if package is in $PKGDEST
Commit ad593b8b61 introduces
a problem when $PKGDEST is set and the package to transfer
has an absolute pathname. In this case there is no need
to add anything to have rsync work properly.

Signed-off-by: Rémy Oudompheng <remy@archlinux.org>
Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
2011-03-28 14:57:22 +02:00
Allan McRae e23c94675e Be less generic with package extension
Arch only uses .gz and .xz packages so look for .pkg.tar.?z.  This
prevents matching potential detached signature files.

Signed-off-by: Allan McRae <allan@archlinux.org>
Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
2011-03-26 13:03:32 +01:00
Lukas Fleischer aa06caf31c Abort properly if source files are not under version control (FS#23122).
Remove superfluous subshell code from version control checks in
commitpkg, making it exit properly if source files are not under version
control. Also, improve correctness of sed(1) commands and use fgrep(1)
instead of grep(1) where appropriate.

Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
2011-03-26 09:37:03 +01:00
Dave Reisner 08a68bb4a0 commitpkg: prefix package filenames with ./
This is a hint to rsync that the file is a path and not a remote module
in the case of a package with an epoch in the version.

Signed-off-by: Dave Reisner <d@falconindy.com>
Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
2011-03-23 20:46:00 +01:00
Florian Pritz 3bc5f6b5c9 add epoch support
Signed-off-by: Florian Pritz <bluewind@server-speed.net>
Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
2011-03-23 19:03:10 +01:00
Pierre Schmitz 7a3550c903 commitpkg: pkgfile might be an absolute path when using PKGDEST 2010-10-19 07:44:35 +02:00
Florian Pritz fbc3929ec0 commitpkg: error out if ~/staging/$repo doesn't exist
Signed-off-by: Florian Pritz <bluewind@xssn.at>
Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
2010-09-16 06:15:40 +02:00
Pierre Schmitz a9bfd8d2c9 ad support for multilib-testing 2010-09-11 19:09:05 +02:00
Pierre Schmitz 79ac757e7f add support for community-staging repository 2010-09-01 20:00:11 +02:00
Pierre Schmitz b591e69541 add initial [multilib] support 2010-08-22 21:52:23 +02:00
Pierre Schmitz 2e6d542220 add [staging] repository 2010-08-17 08:12:03 +02:00
Pierre Schmitz 88764c0298 local can only be used within functions 2010-06-28 10:26:38 +02:00
Pierre Schmitz f2959b8dd5 check if changelog and install files are commited to svn 2010-06-28 09:54:50 +02:00
Pierre Schmitz 76f3e25949 keep partially transferred files 2010-06-25 21:40:45 +02:00
Pierre Schmitz 85251a1d7b removed mode lines; was not a good idea after all 2010-06-24 10:01:20 +02:00
Eric Bélanger 27df94f51b commitpkg: add newline to make output look more orderly
Signed-off-by: Eric Bélanger <snowmaniscool@gmail.com>
Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
2010-06-22 17:09:49 +02:00
Pierre Schmitz 48dead1af7 Force correct remote file permissions 2010-03-31 23:58:59 +02:00
Pierre Schmitz a7c5010d24 Upload any pkg.tar.* file as long as it is canonical 2010-03-03 21:41:53 +01:00
Dan McGee 62e4272ca2 commitpkg: dereference symlinks on package upload
This is a regression introduced after switching to rsync in place of scp;
scp dereferenced symlinks automatically without need for a command-line
option.

Signed-off-by: Dan McGee <dan@archlinux.org>
Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
2010-02-17 06:11:48 +01:00
Pierre Schmitz 362a99b995 apply common coding style 2010-02-13 19:47:16 +01:00
Pierre Schmitz 59b7a739e8 inform the user of activities that might take a longer time 2010-02-13 04:03:10 +01:00
Pierre Schmitz c22a6014d7 supress confusing output of pushd and popd 2010-02-12 01:11:59 +01:00
Pierre Schmitz d440e5998d copy files seperately to avoid escaping problems 2010-02-12 01:07:45 +01:00
Pierre Schmitz 611314a740 check install files, too 2010-02-11 23:48:06 +01:00
Pierre Schmitz a37c07a8cb update comment 2010-02-11 15:27:24 +01:00
Pierre Schmitz 72a2b4789a abort if not all local source files are under version control
This looks a little hacky. The || true is needed because grep will return 1
if in fact everything is fine.

implements FS#18048
2010-02-11 15:19:13 +01:00
Pierre Schmitz d68e7cb031 avoid useless output in commitpkg 2010-02-11 14:01:45 +01:00
Pierre Schmitz 106a0cddfe simplify and optimize upload process
Use rsync instead of scp to be able to continue uploads and get upload
verification for free.

We also try to commit to svn trunk first to avoid useless uploads (FS#18088).
2010-02-11 13:53:30 +01:00
Francois Charette db962d9b7c Change loop var CARCH to _arch
This is just better practice, as CARCH means something else in
makepkg.conf

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-10-26 13:18:27 -07:00
Francois Charette 4fb916c824 Change "uploading to" message to be less ambiguous
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-10-26 13:18:02 -07:00
Evangelos Foutras 169c33195f commitpkg: tidy quotes and remove unneeded braces
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-10-06 09:25:09 -07:00
Evangelos Foutras 86416b25b3 Move package verification into a separate function
Also switch to openssl and sha1 checksums.

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-10-06 09:25:00 -07:00
François Charette 54ae50500b commitpkg: tagged msg is now in archrelease
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-10-06 09:20:59 -07:00
Daniel J Griffiths 14947cf645 commitpkg: Fix pushd for any packages
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-09-23 12:31:19 -07:00
Evangelos Foutras 381f91c336 commitpkg: introduce abort function for errors
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-09-23 12:06:25 -07:00
Evangelos Foutras fa47bd1a17 commitpkg: correct svn commit message spacing
[Aaron: Remove trailing whitespace]
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-09-23 12:02:26 -07:00
Evangelos Foutras 8130fd3846 commitpkg: upload all available architectures
Now commitpkg will go through each architecture defined in the PKGBUILD
and if all packages are present, it will upload them and run archrelease
for that architecture.

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-09-23 12:01:11 -07:00
Evangelos Foutras 3d9c9c1b46 Move initialization code out of the upload loop
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-09-23 12:00:45 -07:00
Evangelos Foutras 70e48eff7a commitpkg: get rid of tabs and indent comments
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-09-23 12:00:00 -07:00
Francois Charette e82825dd6d minor syntax fix
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-09-21 13:08:59 -07:00
Francois Charette 80061e2051 fix indentation
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-09-21 13:08:43 -07:00
Francois Charette a5651376b4 Automate rm of repo-*86* when commiting "any" pkg
This commit integrates part of the functionality of commitpkg2any
in the standard commitpkg script. If the package is for arch=any
and there exists ../repos/$repo-{i686,x86_64}, then these are
removed.

NB: I believe commitpkg2any should be removed, as it encourages
converting a pkg to arch=any with the same $pkgver. It is better
practice to wait for a new version before releasing the pkg
with arch=any. It also saves bandwidth!

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-09-18 13:12:44 -07:00
Daniel J Griffiths c9d1b3457c Add support for community-testing repo
[Aaron: Added Makefile entries]
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-09-18 11:53:18 -07:00