June 2011 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 0/9] repo-add cleanup
by Dave Reisner 24 Jun '11

24 Jun '11

Sigh. This started as a simple addition to the man page to document valid file extensions, and look what happened. The first 4 patches are a resend -- I've fixed the 2 blockers that Allan pointed out, the whitespace error I noticed, and a final tweak at Dan's suggestion to my terrible grammar in the man page. The other patches are a mix of cleanup, features, and a regression fix from an earlier patch I submitted. I wrote myself a little test suite for checking my work. It'll probably (eventually) end up as something more significant since, imo, repo-add deserves some test suite love. d Dave Reisner (9): repo-add: bashify reading of .PKGINFO file repo-add: store multi-value fields as arrays repo-add: use format_entry for all desc/depends fields repo-add.8.txt: document valid DB file extensions repo-add: enforce file extensions repo-add: fix path designation regression repo-add: avoid using ls to check for presence of files repo-add: move command invocation out of arg parsing loop repo-add: allow specifying symlink as repo file doc/repo-add.8.txt | 4 + scripts/repo-add.sh.in | 162 +++++++++++++++++++++++++---------------------- 2 files changed, 90 insertions(+), 76 deletions(-) -- 1.7.5.4

3 17

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.3-315-g94d22f9
by dan＠archlinux.org 24 Jun '11

24 Jun '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 94d22f93096e210cd00d2e9c97c65f77d49ae387 (commit) via 4bdb868ac8d535a3818d519b16eff7d129fe6717 (commit) via 624a87870164ab48bda485204d6fd49c86a0c354 (commit) via 63335859d1b1c77222c31229fe499c031a76361d (commit) via f15cce1d414cb497ee804d50c25c6d3d717240bd (commit) via 3ace8ceb2343621ada4a72fc60e8e03a570fd389 (commit) via 11d8418737d9d9c12584c6eed83bc6cea46ef3e9 (commit) via 763d638ca1d3f1f1d6a8276e36b837e82890f4ee (commit) via a8c3202836014908b95df7d294d2e309faf4b2a0 (commit) via f12ead2cf278d4a9b330d0d320733960fc750e96 (commit) via d589a7b5dbdfcf740d72aa4e9e8fcab9a3de0fbd (commit) via e27a5c88514c5eb9480294374e98914ec27bf65d (commit) from ac7d17f88e200f3f1c213474e7b875ecd341753d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 94d22f93096e210cd00d2e9c97c65f77d49ae387 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jun 22 14:07:27 2011 +1000 Document group and providers selection The format required for selection of packages within the group selection dialog is not entirely obvious, so provide some documentation. Fixes FS#24134. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4bdb868ac8d535a3818d519b16eff7d129fe6717 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jun 18 12:40:14 2011 +1000 makepkg: clean-up of output messages There was a lot of inconsistency in how strings that should not be translated (program names, option flags, PKGBUILD directives, etc) were handled. This patch moves them all outside the gettext invocation for consistency and to prevent accidental translation. Note that some of these may need reverted if they cause difficulties in translation due to gettext usage in bash not taking positional parameters for arguments. A quick survey of current translations indicates that this issue will be rare. Also, we should be able to catch these before a full string freeze given we are going to probably need a "developer preview" release before the next release series. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 624a87870164ab48bda485204d6fd49c86a0c354 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jun 22 15:45:09 2011 -0500 pactest: generate sync DB's in memory Sync database are no longer exploded on the filesystem. Rework the logic used to generate our test databases so we can create them completely in memory without having to write the individual files to disk at all. The local database is unaffected. Note that several shortcomings in libalpm parsing were discovered by this change, which have since been temporarily patched around in this test suite: * archive_fgets() did not properly handle a file that ended in a non-newline, and would silently drop the data in this line. * sync database with only the file entries and not the directories would fail to parse properly, and even cause segfaults in some cases. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 63335859d1b1c77222c31229fe499c031a76361d Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jun 22 15:11:56 2011 -0500 pactest: refactor install file creation Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f15cce1d414cb497ee804d50c25c6d3d717240bd Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jun 22 15:05:53 2011 -0500 pactest: move filelist/backup generation into package object These are definite methods that operate on a package, so move them there which cleans up util a bit more. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3ace8ceb2343621ada4a72fc60e8e03a570fd389 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jun 22 14:39:50 2011 -0500 pactest: make pmfile a bit more pythonic Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 11d8418737d9d9c12584c6eed83bc6cea46ef3e9 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jun 22 14:45:55 2011 -0500 pactest: small cleanups and chmod -x most files Remove empty docstrings, small and easy pylint fixes, etc. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 763d638ca1d3f1f1d6a8276e36b837e82890f4ee Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jun 22 14:28:56 2011 -0500 pactest: clean up database section writing Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a8c3202836014908b95df7d294d2e309faf4b2a0 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jun 22 13:58:07 2011 -0500 pactest: add isize attribute, fix url attribute Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f12ead2cf278d4a9b330d0d320733960fc750e96 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jun 24 00:40:03 2011 -0500 Remove three unnecessary usages of alpm_list_count() For the files count when loading from a package, we can keep a counter. The two in the frontend were completely useless due to the fact that if sync_dbs is non-NULL, alpm_list_count() will always be greater than 0. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d589a7b5dbdfcf740d72aa4e9e8fcab9a3de0fbd Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jun 24 01:33:12 2011 -0500 Prevent segfault when parsing unexpected sync database file This doesn't fix the real (bigger) problem of failing to parse sync databases without directory entries, but it does prevent the parser from segfaulting when the first desc file encountered did not have a directory entry, among other conditions. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e27a5c88514c5eb9480294374e98914ec27bf65d Author: Dave Reisner <d(a)falconindy.com> Date: Wed Jun 22 17:53:06 2011 -0400 parse-options: simplify unused-arg & parameter printing Signed-off-by: Dave Reisner <d(a)falconindy.com> ----------------------------------------------------------------------- Summary of changes: doc/pacman.8.txt | 12 ++- lib/libalpm/be_package.c | 5 +- lib/libalpm/be_sync.c | 6 +- scripts/library/parse_options.sh | 13 +-- scripts/makepkg.sh.in | 102 ++++++++-------- src/pacman/query.c | 2 +- src/pacman/sync.c | 2 +- test/pacman/pactest.py | 20 ++-- test/pacman/pmdb.py | 242 +++++++++++++++---------------------- test/pacman/pmenv.py | 26 ++-- test/pacman/pmfile.py | 24 +++-- test/pacman/pmpkg.py | 49 ++++++++- test/pacman/pmtest.py | 43 +------ test/pacman/util.py | 44 ------- 14 files changed, 255 insertions(+), 335 deletions(-) mode change 100755 => 100644 test/pacman/pmdb.py mode change 100755 => 100644 test/pacman/pmenv.py mode change 100755 => 100644 test/pacman/pmfile.py mode change 100755 => 100644 test/pacman/pmpkg.py mode change 100755 => 100644 test/pacman/pmrule.py mode change 100755 => 100644 test/pacman/pmtest.py mode change 100755 => 100644 test/pacman/util.py hooks/post-receive -- The official pacman repository

3 6

[pacman-dev] [PATCH] makepkg: Remove a lone quotation mark
by Wieland Hoffmann 24 Jun '11

24 Jun '11

Allan broke it in 4bdb868. --- scripts/makepkg.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index e101a76..1043e44 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2245,7 +2245,7 @@ else if (( ! REPKG )); then tidy_install else - warning "$(gettext "Repackaging without the use of a %s" function is deprecated.")" "package()" + warning "$(gettext "Repackaging without the use of a %s function is deprecated.")" "package()" plain "$(gettext "File permissions may not be preserved.")" fi fi -- 1.7.5.4

2 1

Re: [pacman-dev] Discussion about deprecating/removing the changelog feature from pacman.
by Marc - A. Dahlhaus 24 Jun '11

24 Jun '11

Am Donnerstag, den 23.06.2011, 15:48 -0500 schrieb Dan McGee: --8<-- > > We use changelogs quite extensively, and all should keep in mind that > > > > pacman -Qc PACKAGENAME > > > > will help any user that doesn't need to know where your PKGBUILD tree is > > managed / tracked / whatever... > > > > I would suggest that makepkg should be extended to have a way to add the > > output of a command (e.g. "svn log") as changelog to a package... > > > > That would make the life easier for any maintainer and would solve the > > problem even for the lazy arch package maintainers... :-P > > Agree with you here- this seems like it would be a useful addition. > Just calling out to a CHANGELOG_SCRIPT or something would be pretty > awesome. Arch Linux would use svn log --limit <date> of some sort, > other distros using git to track their repos could use git logs, etc. > > If you don't think you're interested in implementing this, I'd at > least suggest opening a feature request for it. Have some things to take care of for upstart first and will take a look at it when i'm done with it. Also have som cleanup work for pacman in my pipe but havn't had time to write down a mail for the list and for implementing it. (Mostly about a removal of '.d' suffix on /etc/pacman.d as its misnamed with respect to all other users of a '.d' suffix in etc and a rework of rate mirrors that would make a packages like "mirrors-{africa,asia,europe,{north,south}america}" possible without much of a hassle for pacman...) Marc

1 0

[pacman-dev] [PATCH] makepkg: remove the cleancache option
by Allan McRae 24 Jun '11

24 Jun '11

This is a fairly useless feature given all it does is an "rm" on a directory. It is also unlikely that you would want to remove the entire SRCDEST anyway, but rather just the old files. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/makepkg.8.txt | 4 ---- scripts/makepkg.sh.in | 36 +----------------------------------- 2 files changed, 1 insertions(+), 39 deletions(-) diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index f15226a..e11e9b3 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -48,10 +48,6 @@ Options *-c, \--clean*:: Clean up leftover work files and directories after a successful build. -*-C, \--cleancache*:: - Removes all cached source files from the directory specified in `SRCDEST` - in linkman:makepkg.conf[5]. - *\--config* <file>:: Use an alternate config file instead of the +{sysconfdir}/makepkg.conf+ default. diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index e101a76..4a4d43c 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -52,7 +52,6 @@ readonly -a packaging_options other_options splitpkg_overrides # Options ASROOT=0 CLEANUP=0 -CLEANCACHE=0 DEP_BIN=0 FORCE=0 INFAKEROOT=0 @@ -1661,7 +1660,6 @@ usage() { echo "$(gettext "Options:")" printf "$(gettext " -A, --ignorearch Ignore incomplete %s field in %s")\n" "arch" "$BUILDSCRIPT" echo "$(gettext " -c, --clean Clean up work files after build")" - echo "$(gettext " -C, --cleancache Clean up source files from the cache")" echo "$(gettext " -d, --nodeps Skip all dependency checks")" printf "$(gettext " -e, --noextract Do not extract source files (use existing %s dir)")\n" "src/" echo "$(gettext " -f, --force Overwrite existing package")" @@ -1719,7 +1717,7 @@ ARGLIST=("$@") # Parse Command Line Options. OPT_SHORT="AcCdefFghiLmop:rRsV" -OPT_LONG="allsource,asroot,ignorearch,check,clean,cleancache,nodeps" +OPT_LONG="allsource,asroot,ignorearch,check,clean,nodeps" OPT_LONG+=",noextract,force,forcever:,geninteg,help,holdver" OPT_LONG+=",install,key:,log,nocolor,nobuild,nocheck,nosign,pkg:,rmdeps" OPT_LONG+=",repackage,skipinteg,sign,source,syncdeps,version,config:" @@ -1744,7 +1742,6 @@ while true; do --asroot) ASROOT=1 ;; -A|--ignorearch) IGNOREARCH=1 ;; -c|--clean) CLEANUP=1 ;; - -C|--cleancache) CLEANCACHE=1 ;; --check) RUN_CHECK='y' ;; --config) shift; MAKEPKG_CONF=$1 ;; -d|--nodeps) NODEPS=1 ;; @@ -1876,37 +1873,6 @@ if (( HOLDVER )) && [[ -n $FORCE_VER ]]; then exit 1 fi -if (( CLEANCACHE )); then - #fix flyspray feature request #5223 - if [[ -n $SRCDEST && ! $SRCDEST -ef "${startdir}" ]]; then - msg "$(gettext "Cleaning up ALL files from %s.")" "$SRCDEST" - echo -n "$(gettext " Are you sure you wish to do this? ")" - echo -n "$(gettext "[y/N]")" - read answer - answer=$(tr '[:lower:]' '[:upper:]' <<< "$answer") - if [[ $answer = $(gettext YES) || $answer = $(gettext Y) ]]; then - rm "$SRCDEST"/* - if (( $? )); then - error "$(gettext "Problem removing files; you may not have correct permissions in %s")" "$SRCDEST" - exit 1 - else - # removal worked - msg "$(gettext "Source cache cleaned.")" - exit 0 - fi - else - # answer = no - msg "$(gettext "No files have been removed.")" - exit 0 - fi - else - # $SRCDEST is $startdir, two possibilities - error "$(gettext "Source destination must be defined in %s.")" "$MAKEPKG_CONF" - plain "$(gettext "In addition, please run %s outside of your cache directory.")" "makepkg -C" - exit 1 - fi -fi - if (( ! INFAKEROOT )); then if (( EUID == 0 && ! ASROOT )); then # Warn those who like to live dangerously. -- 1.7.5.4

2 1

[pacman-dev] [PATCH] Remove three unnecessary usages of alpm_list_count()
by Dan McGee 24 Jun '11

24 Jun '11

For the files count when loading from a package, we can keep a counter. The two in the frontend were completely useless due to the fact that if sync_dbs is non-NULL, alpm_list_count() will always be greater than 0. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/be_package.c | 5 +++-- src/pacman/query.c | 2 +- src/pacman/sync.c | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 1807051..748f27a 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -241,6 +241,7 @@ pmpkg_t *_alpm_pkg_load_internal(pmhandle_t *handle, const char *pkgfile, struct archive_entry *entry; pmpkg_t *newpkg = NULL; struct stat st; + size_t files_count = 0; if(pkgfile == NULL || strlen(pkgfile) == 0) { RET_ERR(handle, PM_ERR_WRONG_ARGS, NULL); @@ -328,6 +329,7 @@ pmpkg_t *_alpm_pkg_load_internal(pmhandle_t *handle, const char *pkgfile, } else if(full) { /* Keep track of all files for filelist generation */ newpkg->files = alpm_list_add(newpkg->files, strdup(entry_name)); + files_count++; } if(archive_read_data_skip(archive)) { @@ -366,8 +368,7 @@ pmpkg_t *_alpm_pkg_load_internal(pmhandle_t *handle, const char *pkgfile, if(full) { /* "checking for conflicts" requires a sorted list, ensure that here */ _alpm_log(handle, PM_LOG_DEBUG, "sorting package filelist for %s\n", pkgfile); - newpkg->files = alpm_list_msort(newpkg->files, alpm_list_count(newpkg->files), - _alpm_str_cmp); + newpkg->files = alpm_list_msort(newpkg->files, files_count, _alpm_str_cmp); newpkg->infolevel = INFRQ_ALL; } else { /* get rid of any partial filelist we may have collected, it is invalid */ diff --git a/src/pacman/query.c b/src/pacman/query.c index aa77907..62472cb 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -502,7 +502,7 @@ int pacman_query(alpm_list_t *targets) if(config->op_q_foreign) { /* ensure we have at least one valid sync db set up */ alpm_list_t *sync_dbs = alpm_option_get_syncdbs(config->handle); - if(sync_dbs == NULL || alpm_list_count(sync_dbs) == 0) { + if(sync_dbs == NULL) { pm_printf(PM_LOG_ERROR, _("no usable package repositories configured.\n")); return 1; } diff --git a/src/pacman/sync.c b/src/pacman/sync.c index acb8a33..6c86bd1 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -911,7 +911,7 @@ int pacman_sync(alpm_list_t *targets) /* ensure we have at least one valid sync db set up */ sync_dbs = alpm_option_get_syncdbs(config->handle); - if(sync_dbs == NULL || alpm_list_count(sync_dbs) == 0) { + if(sync_dbs == NULL) { pm_printf(PM_LOG_ERROR, _("no usable package repositories configured.\n")); return 1; } -- 1.7.5.4

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.3-303-gac7d17f
by dan＠archlinux.org 24 Jun '11

24 Jun '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via ac7d17f88e200f3f1c213474e7b875ecd341753d (commit) via d8d287b4d215eceb382385b84495666f5a03399e (commit) via d62a429b924e70f48bf021d3c355dd9455d1c45b (commit) via c699c0b15466343099d24caa644aba903edabd1a (commit) via 963b942bb91d798ac54cad8a36088fcb7abab278 (commit) via a4a7006a138f05c1b774414a55ffb5499d7b289f (commit) via 78f297dabe17eef518eaccb880f9013641124cda (commit) via fa3aa6441c9a8a4ac460e11d18b4ed3b0ae543b8 (commit) via eedd56f320c175c430ead9226dc871a9ce04ba3f (commit) via aa89a65a83bbac5487fff377cd6ac969e1796542 (commit) via 54ef162a1a9e27e362732d873f0739bc0a2cf1bf (commit) from 886a31ef205923fd5b29012ee75932a2e2dec4bd (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit ac7d17f88e200f3f1c213474e7b875ecd341753d Merge: d8d287b d62a429 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 23 23:44:35 2011 -0500 Merge branch 'po-split' commit d8d287b4d215eceb382385b84495666f5a03399e Author: Dave Reisner <d(a)falconindy.com> Date: Wed Jun 22 09:30:35 2011 -0400 repo-add: fix path designation regression b899099 made path checking a bit more strict than I had intended, and would actually forbid creation of a repo in $PWD if only the filename was specified. readlink would be the fun and easy solution here, but it's avoided due to portability issues, making the validation process a bit more verbose. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d62a429b924e70f48bf021d3c355dd9455d1c45b Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 23 22:25:16 2011 -0500 scripts/po/: add pacman-key This has gettext strings, but wasn't added to the list of files in POTFILES.in just yet. Add it and update the catalogs. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c699c0b15466343099d24caa644aba903edabd1a Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 23 22:01:20 2011 -0500 src/pacman/po/: prune message catalog and translations Now that we have performed the split, prune the catalogs of all scripts-only messages. All old messages were pruned from the files using the following command: sed -i -e '/^#\~/,$d' *.po Note: the diff on this commit looks much less insane if the --patience option is used. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 963b942bb91d798ac54cad8a36088fcb7abab278 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 23 21:58:18 2011 -0500 scripts/po/: prune message catalog and translations Now that we have performed the split, prune the catalogs of all pacman-only messages. All old messages were pruned from the files using the following command: sed -i -e '/^#\~/,' *.po Note: the diff on this commit looks much less insane if the --patience option is used. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a4a7006a138f05c1b774414a55ffb5499d7b289f Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 23 21:21:51 2011 -0500 po/: split into scripts/po/ and src/pacman/po/ This is the first step at separating the pacman message catalog and the scripts message catalog. Makefiles, configure.ac, and other such files are adjusted accordingly, as well as renaming files. The TEXTDOMAIN of scripts is also adjusted. Note that no actual pot or po files get changed here; these will get pruned in a future commit so each catalog contains only the necessary messages. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 78f297dabe17eef518eaccb880f9013641124cda Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 23 21:48:35 2011 -0500 Update all translation files This is for the eventual 4.0.0 release, but more importantly to logically separate new translations and strings from the PO split about to happen between pacman and scripts. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit fa3aa6441c9a8a4ac460e11d18b4ed3b0ae543b8 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 23 22:22:57 2011 -0500 Let configure gettext setup know we use ngettext() Signed-off-by: Dan McGee <dan(a)archlinux.org> commit eedd56f320c175c430ead9226dc871a9ce04ba3f Author: Eric Bélanger <snowmaniscool(a)gmail.com> Date: Thu Jun 23 00:02:33 2011 -0400 makepkg: Added checks in check_software for distcc, ccache, strip and gzip Dan: slightly shorten some of the messages. Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit aa89a65a83bbac5487fff377cd6ac969e1796542 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 23 15:19:01 2011 -0500 makepkg: remove distcc/makeflags option interaction Way back in c94bfbaba when refactoring makepkg options handling, I added these lines to unset MAKEFLAGS if '!distcc' was set in a PKGBUILD (not taking into account makepkg.conf settings). This was an attempt to say "if it is broken in distcc, it is probably broken even more". However, this is silly as one should be using '!makeflags' as well. Remove the linkage. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 54ef162a1a9e27e362732d873f0739bc0a2cf1bf Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 16 13:15:11 2011 -0500 Convert backup list to new pmbackup_t type This allows us to separate the name and hash elements in one place and not scatter different parsing code all over the place, including both the frontend and backend. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: Makefile.am | 2 +- configure.ac | 5 +- lib/libalpm/add.c | 67 +- lib/libalpm/alpm.h | 6 + lib/libalpm/backup.c | 80 +- lib/libalpm/backup.h | 8 +- lib/libalpm/be_local.c | 12 +- lib/libalpm/be_package.c | 5 +- lib/libalpm/package.c | 7 +- lib/libalpm/package.h | 1 + lib/libalpm/po/Makevars | 2 +- lib/libalpm/po/ca.po | 57 +- lib/libalpm/po/cs.po | 57 +- lib/libalpm/po/da.po | 51 +- lib/libalpm/po/de.po | 57 +- lib/libalpm/po/el.po | 57 +- lib/libalpm/po/en_GB.po | 57 +- lib/libalpm/po/es.po | 57 +- lib/libalpm/po/fi.po | 58 +- lib/libalpm/po/fr.po | 58 +- lib/libalpm/po/hu.po | 57 +- lib/libalpm/po/it.po | 59 +- lib/libalpm/po/kk.po | 57 +- lib/libalpm/po/libalpm.pot | 42 +- lib/libalpm/po/nb.po | 57 +- lib/libalpm/po/pl.po | 57 +- lib/libalpm/po/pt.po | 57 +- lib/libalpm/po/pt_BR.po | 57 +- lib/libalpm/po/ro.po | 61 +- lib/libalpm/po/ru.po | 57 +- lib/libalpm/po/sk.po | 58 +- lib/libalpm/po/sr.po | 57 +- lib/libalpm/po/sr(a)latin.po | 57 +- lib/libalpm/po/sv.po | 51 +- lib/libalpm/po/tr.po | 57 +- lib/libalpm/po/uk.po | 51 +- lib/libalpm/po/zh_CN.po | 57 +- lib/libalpm/remove.c | 22 +- po/POTFILES.in | 21 - po/ca.po | 1946 ------------------- po/cs.po | 1888 ------------------- po/da.po | 1866 ------------------ po/de.po | 1961 ------------------- po/el.po | 1896 ------------------- po/en_GB.po | 1874 ------------------- po/es.po | 1955 ------------------- po/fi.po | 1914 ------------------- po/fr.po | 1957 ------------------- po/hu.po | 1924 ------------------- po/it.po | 1952 ------------------- po/kk.po | 1894 ------------------- po/nb.po | 1894 ------------------- po/pacman.pot | 1784 ------------------ po/pl.po | 1901 ------------------- po/pt.po | 1972 -------------------- po/pt_BR.po | 1947 ------------------- po/ro.po | 1954 ------------------- po/ru.po | 1912 ------------------- po/sk.po | 1891 ------------------- po/sr.po | 1888 ------------------- po/sr(a)latin.po | 1892 ------------------- po/sv.po | 1871 ------------------- po/tr.po | 1907 ------------------- po/uk.po | 1878 ------------------- po/zh_CN.po | 1822 ------------------ scripts/Makefile.am | 2 + scripts/makepkg.sh.in | 37 +- scripts/pacman-db-upgrade.sh.in | 2 +- scripts/pacman-key.sh.in | 2 +- scripts/pacman-optimize.sh.in | 2 +- scripts/pkgdelta.sh.in | 2 +- {po => scripts/po}/.gitignore | 0 {po => scripts/po}/LINGUAS | 0 {po => scripts/po}/Makefile.in.in | 0 {lib/libalpm => scripts}/po/Makevars | 6 +- scripts/po/POTFILES.in | 9 + scripts/po/ca.po | 1067 +++++++++++ scripts/po/cs.po | 1020 ++++++++++ scripts/po/da.po | 1018 ++++++++++ scripts/po/de.po | 1075 +++++++++++ scripts/po/el.po | 1030 ++++++++++ scripts/po/en_GB.po | 1018 ++++++++++ scripts/po/es.po | 1056 +++++++++++ scripts/po/fi.po | 1056 +++++++++++ scripts/po/fr.po | 1076 +++++++++++ scripts/po/hu.po | 1065 +++++++++++ scripts/po/it.po | 1072 +++++++++++ scripts/po/kk.po | 1044 +++++++++++ scripts/po/nb.po | 1028 ++++++++++ scripts/po/pacman-scripts.pot | 943 ++++++++++ scripts/po/pl.po | 1026 ++++++++++ scripts/po/pt.po | 1079 +++++++++++ scripts/po/pt_BR.po | 1070 +++++++++++ {po => scripts/po}/remove-potcdate.sin | 0 scripts/po/ro.po | 1060 +++++++++++ scripts/po/ru.po | 1055 +++++++++++ scripts/po/sk.po | 1023 ++++++++++ scripts/po/sr.po | 1026 ++++++++++ scripts/po/sr(a)latin.po | 1028 ++++++++++ scripts/po/sv.po | 1021 ++++++++++ scripts/po/tr.po | 1050 +++++++++++ scripts/po/uk.po | 1025 ++++++++++ scripts/po/zh_CN.po | 1003 ++++++++++ scripts/repo-add.sh.in | 15 +- src/pacman/Makefile.am | 2 + src/pacman/package.c | 19 +- {lib/libalpm => src/pacman}/po/.gitignore | 0 {lib/libalpm => src/pacman}/po/LINGUAS | 0 {lib/libalpm => src/pacman}/po/Makefile.in.in | 0 {po => src/pacman/po}/Makevars | 4 +- src/pacman/po/POTFILES.in | 14 + src/pacman/po/ca.po | 1154 ++++++++++++ src/pacman/po/cs.po | 1130 +++++++++++ src/pacman/po/da.po | 1117 +++++++++++ src/pacman/po/de.po | 1153 ++++++++++++ src/pacman/po/el.po | 1127 +++++++++++ src/pacman/po/en_GB.po | 1117 +++++++++++ src/pacman/po/es.po | 1173 ++++++++++++ src/pacman/po/fi.po | 1123 +++++++++++ src/pacman/po/fr.po | 1163 ++++++++++++ src/pacman/po/hu.po | 1131 +++++++++++ src/pacman/po/it.po | 1153 ++++++++++++ src/pacman/po/kk.po | 1118 +++++++++++ src/pacman/po/nb.po | 1124 +++++++++++ src/pacman/po/pacman.pot | 1070 +++++++++++ src/pacman/po/pl.po | 1138 +++++++++++ src/pacman/po/pt.po | 1167 ++++++++++++ src/pacman/po/pt_BR.po | 1153 ++++++++++++ {lib/libalpm => src/pacman}/po/remove-potcdate.sin | 0 src/pacman/po/ro.po | 1163 ++++++++++++ src/pacman/po/ru.po | 1133 +++++++++++ src/pacman/po/sk.po | 1130 +++++++++++ src/pacman/po/sr.po | 1125 +++++++++++ src/pacman/po/sr(a)latin.po | 1127 +++++++++++ src/pacman/po/sv.po | 1116 +++++++++++ src/pacman/po/tr.po | 1120 +++++++++++ src/pacman/po/uk.po | 1127 +++++++++++ src/pacman/po/zh_CN.po | 1085 +++++++++++ 138 files changed, 57572 insertions(+), 50251 deletions(-) delete mode 100644 po/POTFILES.in delete mode 100644 po/ca.po delete mode 100644 po/cs.po delete mode 100644 po/da.po delete mode 100644 po/de.po delete mode 100644 po/el.po delete mode 100644 po/en_GB.po delete mode 100644 po/es.po delete mode 100644 po/fi.po delete mode 100644 po/fr.po delete mode 100644 po/hu.po delete mode 100644 po/it.po delete mode 100644 po/kk.po delete mode 100644 po/nb.po delete mode 100644 po/pacman.pot delete mode 100644 po/pl.po delete mode 100644 po/pt.po delete mode 100644 po/pt_BR.po delete mode 100644 po/ro.po delete mode 100644 po/ru.po delete mode 100644 po/sk.po delete mode 100644 po/sr.po delete mode 100644 po/sr(a)latin.po delete mode 100644 po/sv.po delete mode 100644 po/tr.po delete mode 100644 po/uk.po delete mode 100644 po/zh_CN.po rename {po => scripts/po}/.gitignore (100%) rename {po => scripts/po}/LINGUAS (100%) rename {po => scripts/po}/Makefile.in.in (100%) copy {lib/libalpm => scripts}/po/Makevars (93%) create mode 100644 scripts/po/POTFILES.in create mode 100644 scripts/po/ca.po create mode 100644 scripts/po/cs.po create mode 100644 scripts/po/da.po create mode 100644 scripts/po/de.po create mode 100644 scripts/po/el.po create mode 100644 scripts/po/en_GB.po create mode 100644 scripts/po/es.po create mode 100644 scripts/po/fi.po create mode 100644 scripts/po/fr.po create mode 100644 scripts/po/hu.po create mode 100644 scripts/po/it.po create mode 100644 scripts/po/kk.po create mode 100644 scripts/po/nb.po create mode 100644 scripts/po/pacman-scripts.pot create mode 100644 scripts/po/pl.po create mode 100644 scripts/po/pt.po create mode 100644 scripts/po/pt_BR.po rename {po => scripts/po}/remove-potcdate.sin (100%) create mode 100644 scripts/po/ro.po create mode 100644 scripts/po/ru.po create mode 100644 scripts/po/sk.po create mode 100644 scripts/po/sr.po create mode 100644 scripts/po/sr(a)latin.po create mode 100644 scripts/po/sv.po create mode 100644 scripts/po/tr.po create mode 100644 scripts/po/uk.po create mode 100644 scripts/po/zh_CN.po copy {lib/libalpm => src/pacman}/po/.gitignore (100%) copy {lib/libalpm => src/pacman}/po/LINGUAS (100%) copy {lib/libalpm => src/pacman}/po/Makefile.in.in (100%) rename {po => src/pacman/po}/Makevars (95%) create mode 100644 src/pacman/po/POTFILES.in create mode 100644 src/pacman/po/ca.po create mode 100644 src/pacman/po/cs.po create mode 100644 src/pacman/po/da.po create mode 100644 src/pacman/po/de.po create mode 100644 src/pacman/po/el.po create mode 100644 src/pacman/po/en_GB.po create mode 100644 src/pacman/po/es.po create mode 100644 src/pacman/po/fi.po create mode 100644 src/pacman/po/fr.po create mode 100644 src/pacman/po/hu.po create mode 100644 src/pacman/po/it.po create mode 100644 src/pacman/po/kk.po create mode 100644 src/pacman/po/nb.po create mode 100644 src/pacman/po/pacman.pot create mode 100644 src/pacman/po/pl.po create mode 100644 src/pacman/po/pt.po create mode 100644 src/pacman/po/pt_BR.po copy {lib/libalpm => src/pacman}/po/remove-potcdate.sin (100%) create mode 100644 src/pacman/po/ro.po create mode 100644 src/pacman/po/ru.po create mode 100644 src/pacman/po/sk.po create mode 100644 src/pacman/po/sr.po create mode 100644 src/pacman/po/sr(a)latin.po create mode 100644 src/pacman/po/sv.po create mode 100644 src/pacman/po/tr.po create mode 100644 src/pacman/po/uk.po create mode 100644 src/pacman/po/zh_CN.po hooks/post-receive -- The official pacman repository

2 1

[pacman-dev] Fwd: [PATCH 8/9] repo-add: move command invocation out of arg parsing loop
by Dave Reisner 24 Jun '11

24 Jun '11

Forwarding this, as it seems to have been eaten by gmail as well on the initial send... d ----- Forwarded message from Dave Reisner <d(a)falconindy.com> ----- > Date: Wed, 22 Jun 2011 20:38:52 -0400 > From: Dave Reisner <d(a)falconindy.com> > To: pacman-dev(a)archlinux.org > Cc: Dave Reisner <d(a)falconindy.com> > Subject: [PATCH 8/9] repo-add: move command invocation out of arg parsing loop > > This is mostly a move to make the code easier to read, but it's my feeling > that the arg parsing loop should parse args, and the actual program logic > should be separated from this. > > Signed-off-by: Dave Reisner <d(a)falconindy.com> > --- > scripts/repo-add.sh.in | 23 ++++++++++++----------- > 1 files changed, 12 insertions(+), 11 deletions(-) > > diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in > index e75055f..8865188 100644 > --- a/scripts/repo-add.sh.in > +++ b/scripts/repo-add.sh.in > @@ -529,9 +529,10 @@ trap 'trap_exit "$(gettext "TERM signal caught. Exiting...")"' TERM HUP QUIT > trap 'trap_exit "$(gettext "Aborted by user! Exiting...")"' INT > trap 'trap_exit "$(gettext "An unknown error has occured. Exiting...")"' ERR > > +declare -a args > success=0 > # parse arguments > -while [[ $# > 0 ]]; do > +while (( $# )); do > case "$1" in > -q|--quiet) QUIET=1;; > -d|--delta) DELTA=1;; > @@ -562,21 +563,21 @@ while [[ $# > 0 ]]; do > VERIFY=1 > ;; > *) > - if [[ -z $REPO_DB_FILE ]]; then > - REPO_DB_FILE="$1" > - LOCKFILE="$REPO_DB_FILE.lck" > - check_repo_db > - else > - case "$cmd" in > - repo-add) add $1 && success=1 ;; > - repo-remove) remove $1 && success=1 ;; > - esac > - fi > + args+=("$1") > ;; > esac > shift > done > > +REPO_DB_FILE=${args[0]} > +LOCKFILE=$REPO_DB_FILE.lck > +check_repo_db > + > +# we've already validated our command -- just trim it to get the function > +for arg in "${args[@]:1}"; do > + "${cmd#repo-}" "$arg" && success=1 > +done > + > # if at least one operation was a success, re-zip database > if (( success )); then > msg "$(gettext "Creating updated database file '%s'")" "$REPO_DB_FILE" > -- > 1.7.5.4 > ----- End forwarded message -----

2 1

[pacman-dev] [PATCH] makepkg: Added checks in check_software for distcc, ccache, strip and gzip
by Eric Bélanger 24 Jun '11

24 Jun '11

Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> --- I thought about adding checks for the PKGEXT and SRCEXT compression utilities but I'm not sure as it might be overkill. Anyway, they could always be added later on in another patch. BTW, I didn't test this patch as it seemed quite straightforward. scripts/makepkg.sh.in | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 239bb64..e9b8c56 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1485,6 +1485,38 @@ check_software() { fi fi + # distcc - compilation with distcc + if [[ $(check_buildenv distcc) = "y" && $(check_option distcc) != "n" ]]; then + if ! type -p distcc >/dev/null; then + error "$(gettext "Cannot find the %s binary required for distributed compilation.")" "distcc" + ret=1 + fi + fi + + # ccache - compilation with ccache + if [[ $(check_buildenv ccache) = "y" && $(check_option ccache) != "n" ]]; then + if ! type -p ccache >/dev/null; then + error "$(gettext "Cannot find the %s binary required for compilation with compiler cache.")" "ccache" + ret=1 + fi + fi + + # strip - strip symbols from binaries/libraries + if [[ $(check_option strip) = y ]]; then + if ! type -p strip >/dev/null; then + error "$(gettext "Cannot find the %s binary required for stripping unneeded symbols from binaries and libraries.")" "strip" + ret=1 + fi + fi + + # gzip - compressig man and info pages + if [[ $(check_option zipman) = "y" ]]; then + if ! type -p gzip >/dev/null; then + error "$(gettext "Cannot find the %s binary required for compressing man and info pages.")" "gzip" + ret=1 + fi + fi + return $ret } -- 1.7.5.4

2 2

[pacman-dev] [PATCH] makepkg: remove distcc/makeflags option interaction
by Dan McGee 23 Jun '11

23 Jun '11

Way back in c94bfbaba when refactoring makepkg options handling, I added these lines to unset MAKEFLAGS if '!distcc' was set in a PKGBUILD (not taking into account makepkg.conf settings). This was an attempt to say "if it is broken in distcc, it is probably broken even more". However, this is silly as one should be using '!makeflags' as well. Remove the linkage. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- scripts/makepkg.sh.in | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 239bb64..cd94ac9 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -822,9 +822,6 @@ run_build() { if [[ $(check_buildenv distcc) = "y" && $(check_option distcc) != "n" ]]; then [[ -d /usr/lib/distcc/bin ]] && export PATH="/usr/lib/distcc/bin:$PATH" export DISTCC_HOSTS - elif [[ $(check_option distcc) = "n" ]]; then - # if it is not wanted, clear the makeflags too - MAKEFLAGS="" fi # use ccache if it is requested (check buildenv and PKGBUILD opts) -- 1.7.5.4

2 1