February 2012 - Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v4.0.2-8-gca41427
by dan＠archlinux.org 17 Feb '12

17 Feb '12

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, maint has been updated via ca4142714137b16feabac09c4cda86b0a75036f8 (commit) via 242006933d31c88b844f8f8d0c2f0806763cc51f (commit) via 85712814cdbfa301e5827fafd6bfb8ac0886079c (commit) via 9a1ff474f1fe03e8bfdaf81ffc9a4881a44baea9 (commit) via edd81f3e8b505be2f7c7a18d3c28956b82264c45 (commit) via 6c78f0d56007ae5bbbaf9f15f6399e6e2967dd76 (commit) via 13a1d5883c9aa81ee10d61cbe4c2f2223dad9a50 (commit) from b4f5a63e7fee5d04949e290bd63e5f0e94bd211e (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 ca4142714137b16feabac09c4cda86b0a75036f8 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed Feb 15 22:50:51 2012 -0500 parseopts: normalize options into an array Modify parse_options logic to fill an array instead of printing parsed options. Avoid eval like the plague. Because it is the plague. Fixes bugs such as FS#28445. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 242006933d31c88b844f8f8d0c2f0806763cc51f Author: Eric Bélanger <snowmaniscool(a)gmail.com> Date: Thu Feb 16 00:56:29 2012 -0500 pacsysclean: Fix script description and accept -o option without hyphen Close FS#28434 Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 85712814cdbfa301e5827fafd6bfb8ac0886079c Author: Dan McGee <dan(a)archlinux.org> Date: Wed Feb 15 15:40:01 2012 -0600 Revert "Add -S --recursive operation" This reverts commit f3fa77bcf1d792971c314f8c0de255866e89f3f3 along with making other necessary changes to fully back this (mis)feature out until we can do it correctly. The quick summary here is this was not implemented correctly; provides are not fully taken into account in this logic, and making that happen exposes a lot of other flaws in this code that are covered up later on in the dependency resolving process by several other pieces of convoluted and conditional logic. Tests have been adjusted accordingly. Some test EXISTS conditions have been removed as we already know the package is installed locally, and we also are checking the VERSION condition anyway. With these two related revert commits, we do have some changes in test pass/fail results: * upgrade078.py: does not pass, this is due to --recursive getting removed for -U/-S operations after this commit. * sync302.py: the version checks have been disabled, so this test continues to pass but has been scaled back in scope. * sync303.py: now passes, was failing before. * sync304.py: still failing, was failing before. * sync305.py: now passes, was failing before. * sync306.py: still passes, was passing before. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 9a1ff474f1fe03e8bfdaf81ffc9a4881a44baea9 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Feb 15 15:16:23 2012 -0600 Revert "Enable recursive/needed sync on SyncFirst" This reverts commit 09034520325efcc2e684f05fa7a99c02bad1f5be. Tests affected by this revert have been adjusted; additionally a few EXIST tests have been removed where there is already a VERSION test doing the job for us. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit edd81f3e8b505be2f7c7a18d3c28956b82264c45 Author: Christoph Vigano <mail(a)cvigano.de> Date: Tue Feb 14 21:31:04 2012 +0100 makepkg: fix syntax error in remove_deps This fixes a problem that occurs if you tell makepkg to remove installed dependencies (just to be sure) but there are none. As the $ was missing in front of deplist, the check never happened and 'pacman -Rn' was called which obviously failed. Dan: later reported as FS#28448. Signed-off-by: Christoph Vigano <mail(a)cvigano.de> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6c78f0d56007ae5bbbaf9f15f6399e6e2967dd76 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Feb 14 12:12:24 2012 -0600 Update SIGPIPE signal handler comment Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 13a1d5883c9aa81ee10d61cbe4c2f2223dad9a50 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Feb 14 10:11:43 2012 -0600 scripts: unset CDPATH if cd is used This wonderful/awful little bash shell variable wrecks havoc on `cd` calls in shell scripts. Unset CDPATH in makepkg where we use `cd` quite heavily. In pacman-optimize, we can move the change directory logic into the bsdtar call so we are left with no usages of `cd` in the script. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/pacsysclean.in | 7 +++++-- doc/pacman.8.txt | 7 ------- lib/libalpm/deps.c | 29 ----------------------------- lib/libalpm/dload.c | 4 ++-- scripts/library/parse_options.sh | 32 +++++++++++--------------------- scripts/makepkg.sh.in | 10 ++++++---- scripts/pacman-key.sh.in | 6 +++--- scripts/pacman-optimize.sh.in | 3 +-- src/pacman/conf.h | 1 - src/pacman/pacman.c | 8 +------- src/pacman/sync.c | 2 -- test/pacman/tests/sync302.py | 8 ++++---- test/pacman/tests/sync303.py | 3 --- test/pacman/tests/sync304.py | 2 -- test/pacman/tests/sync305.py | 3 --- test/pacman/tests/sync306.py | 1 - test/pacman/tests/upgrade078.py | 17 ++++++++--------- 17 files changed, 41 insertions(+), 102 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Remove SyncFirst option
by Dan McGee 16 Feb '12

16 Feb '12

This has outlived its usefulness and causes more problems than it solves. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- This is an RFC first of all, so please feel free to comment. Pros: 1. Removes complexity and a fair amount of code. 2. Removes the hack necesary for download-only and print operations. 3. Closes at least two bug reports. 4. Pacman is now much more resiliant to updates to itself since vercmp is statically linked, etc. so updating it alone isn't always necessary. Cons: 1. If a major underlying change occurs (such as a new compression format), users would need to update pacman explicitly first. 2. ??? doc/pacman.conf.5.txt | 9 ----- etc/pacman.conf.in | 2 - src/pacman/conf.c | 3 +- src/pacman/conf.h | 1 - src/pacman/sync.c | 55 +--------------------------------- test/pacman/README | 1 - test/pacman/tests/sync301.py | 27 ----------------- test/pacman/tests/sync302.py | 49 ------------------------------ test/pacman/tests/sync303.py | 38 ----------------------- test/pacman/tests/sync304.py | 27 ----------------- test/pacman/tests/sync305.py | 67 ------------------------------------------ 11 files changed, 2 insertions(+), 277 deletions(-) delete mode 100644 test/pacman/tests/sync301.py delete mode 100644 test/pacman/tests/sync302.py delete mode 100644 test/pacman/tests/sync303.py delete mode 100644 test/pacman/tests/sync304.py delete mode 100644 test/pacman/tests/sync305.py diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt index 3913292..a9c5db3 100644 --- a/doc/pacman.conf.5.txt +++ b/doc/pacman.conf.5.txt @@ -93,15 +93,6 @@ Options Instructs pacman to ignore any upgrades for this package when performing a '\--sysupgrade'. Shell-style glob patterns are allowed. -*SyncFirst =* package ...:: - Instructs pacman to check for newer version of these packages before any - sync operation. The user will have the choice to either cancel the current - operation and upgrade these packages first or go on with the current - operation. This option is typically used with the 'pacman' package. - *NOTE*: when a `SyncFirst` transaction takes place, no command line flags - (e.g. '\--force') are honored. If this is not ideal, disabling `SyncFirst` - and performing a manual sync of the involved packages may be required. - *IgnoreGroup =* group ...:: Instructs pacman to ignore any upgrades for all packages in this group when performing a '\--sysupgrade'. Shell-style glob patterns are diff --git a/etc/pacman.conf.in b/etc/pacman.conf.in index 7f9db1b..4c72724 100644 --- a/etc/pacman.conf.in +++ b/etc/pacman.conf.in @@ -15,8 +15,6 @@ #LogFile = @localstatedir@/log/pacman.log #GPGDir = @sysconfdir@/pacman.d/gnupg/ HoldPkg = pacman glibc -# If upgrades are available for these packages they will be asked for first -SyncFirst = pacman #XferCommand = /usr/bin/curl -C - -f %u > %o #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u #CleanMethod = KeepInstalled diff --git a/src/pacman/conf.c b/src/pacman/conf.c index bfa8cad..e03df36 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -71,7 +71,6 @@ int config_free(config_t *oldconfig) alpm_list_free(oldconfig->explicit_removes); FREELIST(oldconfig->holdpkg); - FREELIST(oldconfig->syncfirst); FREELIST(oldconfig->ignorepkg); FREELIST(oldconfig->ignoregrp); FREELIST(oldconfig->noupgrade); @@ -423,7 +422,7 @@ static int _parse_options(const char *key, char *value, } else if(strcmp(key, "HoldPkg") == 0) { setrepeatingoption(value, "HoldPkg", &(config->holdpkg)); } else if(strcmp(key, "SyncFirst") == 0) { - setrepeatingoption(value, "SyncFirst", &(config->syncfirst)); + /* old option, do nothing */ } else if(strcmp(key, "CacheDir") == 0) { setrepeatingoption(value, "CacheDir", &(config->cachedirs)); } else if(strcmp(key, "Architecture") == 0) { diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 481132f..9b6ab20 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -84,7 +84,6 @@ typedef struct __config_t { /* select -Sc behavior */ unsigned short cleanmethod; alpm_list_t *holdpkg; - alpm_list_t *syncfirst; alpm_list_t *ignorepkg; alpm_list_t *ignoregrp; alpm_list_t *noupgrade; diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 700bb78..612cd5f 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -549,26 +549,6 @@ static int sync_list(alpm_list_t *syncs, alpm_list_t *targets) return 0; } -static alpm_list_t *syncfirst(void) { - alpm_list_t *i, *res = NULL; - alpm_db_t *db_local = alpm_get_localdb(config->handle); - alpm_list_t *syncdbs = alpm_get_syncdbs(config->handle); - - for(i = config->syncfirst; i; i = alpm_list_next(i)) { - const char *pkgname = i->data; - alpm_pkg_t *pkg = alpm_db_get_pkg(db_local, pkgname); - if(pkg == NULL) { - continue; - } - - if(alpm_sync_newversion(pkg, syncdbs)) { - res = alpm_list_add(res, strdup(pkgname)); - } - } - - return res; -} - static alpm_db_t *get_db(const char *dbname) { alpm_list_t *i; @@ -959,40 +939,7 @@ int pacman_sync(alpm_list_t *targets) } } - alpm_list_t *targs = alpm_list_strdup(targets); - if(!config->op_s_downloadonly && !config->print) { - /* check for newer versions of packages to be upgraded first */ - alpm_list_t *packages = syncfirst(); - if(packages) { - /* Do not ask user if all the -S targets are SyncFirst packages, see FS#15810 */ - alpm_list_t *tmp = NULL; - if(config->op_s_upgrade || (tmp = alpm_list_diff(targets, packages, (alpm_list_fn_cmp)strcmp))) { - alpm_list_free(tmp); - printf(_(":: The following packages should be upgraded first :\n")); - list_display(" ", packages); - if(yesno(_(":: Do you want to cancel the current operation\n" - ":: and upgrade these packages now?"))) { - FREELIST(targs); - targs = packages; - config->flags = 0; - config->flags |= ALPM_TRANS_FLAG_RECURSE; - config->flags |= ALPM_TRANS_FLAG_NEEDED; - config->op_s_upgrade = 0; - } else { - FREELIST(packages); - } - printf("\n"); - } else { - pm_printf(ALPM_LOG_DEBUG, "skipping SyncFirst dialog\n"); - FREELIST(packages); - } - } - } - - int ret = sync_trans(targs); - FREELIST(targs); - - return ret; + return sync_trans(targets); } /* vim: set ts=2 sw=2 noet: */ diff --git a/test/pacman/README b/test/pacman/README index a3c36fc..ae3303a 100644 --- a/test/pacman/README +++ b/test/pacman/README @@ -108,7 +108,6 @@ is not necessarily complete: - HoldPkg - IgnorePkg - IgnoreGroup - - SyncFirst - NoExtract - NoUpgrade - XferCommand diff --git a/test/pacman/tests/sync301.py b/test/pacman/tests/sync301.py deleted file mode 100644 index 96402fc..0000000 --- a/test/pacman/tests/sync301.py +++ /dev/null @@ -1,27 +0,0 @@ -self.description = "Sysupgrade : pacman needs to be upgraded and has new deps" - -sp = pmpkg("pacman", "1.0-2") -sp.depends = ["dep"] -self.addpkg2db("sync", sp) - -spdep = pmpkg("dep") -self.addpkg2db("sync", spdep) - -sp1 = pmpkg("pkg1", "1.0-2") -self.addpkg2db("sync", sp1) - -lp = pmpkg("pacman", "1.0-1") -self.addpkg2db("local", lp) - -lp1 = pmpkg("pkg1", "1.0-1") -self.addpkg2db("local", lp1) - -self.option["SyncFirst"] = ["pacman"] - -self.args = "-Su" - -self.addrule("PACMAN_RETCODE=0") -self.addrule("PKG_EXIST=pacman") -self.addrule("PKG_VERSION=pacman|1.0-2") -self.addrule("PKG_VERSION=pkg1|1.0-1") -self.addrule("PKG_EXIST=dep") diff --git a/test/pacman/tests/sync302.py b/test/pacman/tests/sync302.py deleted file mode 100644 index b44aaed..0000000 --- a/test/pacman/tests/sync302.py +++ /dev/null @@ -1,49 +0,0 @@ -self.description = "Sysupgrade : pacman needs to be upgraded and has updated deps" - -sp = pmpkg("pacman", "1.0-2") -sp.depends = ["zlib", "curl", "libarchive"] -self.addpkg2db("sync", sp) - -libcdep = pmpkg("glibc", "2.15-1") -self.addpkg2db("sync", libcdep) - -curldep = pmpkg("curl", "7.22-1") -self.addpkg2db("sync", curldep) - -libadep = pmpkg("libarchive", "2.8.5-1") -self.addpkg2db("sync", libadep) - -zlibdep = pmpkg("zlib", "1.2.5-3") -zlibdep.depends = ["glibc"] -self.addpkg2db("sync", zlibdep) - - -lp = pmpkg("pacman", "1.0-1") -self.addpkg2db("local", lp) - -lp1 = pmpkg("curl", "7.21.7-1") -self.addpkg2db("local", lp1) - -lp2 = pmpkg("glibc", "2.13-1") -self.addpkg2db("local", lp2) - -lp3 = pmpkg("libarchive", "2.8.4-1") -self.addpkg2db("local", lp3) - -lp4 = pmpkg("zlib", "1.2.5-3") -self.addpkg2db("local", lp4) - -self.option["SyncFirst"] = ["pacman"] - -self.args = "-Su" - -self.addrule("PACMAN_RETCODE=0") -self.addrule("PKG_EXIST=pacman") -self.addrule("PKG_VERSION=pacman|1.0-2") -self.addrule("PKG_EXIST=glibc") -self.addrule("PKG_VERSION=glibc|2.15-1") -self.addrule("PKG_EXIST=curl") -self.addrule("PKG_VERSION=curl|7.22-1") -self.addrule("PKG_EXIST=libarchive") -self.addrule("PKG_VERSION=libarchive|2.8.5-1") -self.addrule("PKG_EXIST=zlib") diff --git a/test/pacman/tests/sync303.py b/test/pacman/tests/sync303.py deleted file mode 100644 index b717dd2..0000000 --- a/test/pacman/tests/sync303.py +++ /dev/null @@ -1,38 +0,0 @@ -self.description = "Sysupgrade: upgrade pacman with deps as provisions" - -sp = pmpkg("pacman", "1.0-2") -sp.depends = ["zlib"] -self.addpkg2db("sync", sp) - -glibcdep = pmpkg("glibc", "2.13-1") -self.addpkg2db("sync", glibcdep) - -zlibdep = pmpkg("zlib", "1.2.5-3") -zlibdep.depends = ["glibc"] -self.addpkg2db("sync", zlibdep) - - -lp = pmpkg("pacman", "1.0-1") -lp.depends = ["zlib"] -self.addpkg2db("local", lp) - -lp2 = pmpkg("glibc-awesome", "2.13-2") -lp2.provides = ["glibc=2.13"] -lp2.conflicts = ["glibc"] -self.addpkg2db("local", lp2) - -lp3 = pmpkg("zlib", "1.2.5-3") -self.addpkg2db("local", lp3) - -self.option["SyncFirst"] = ["pacman"] - -self.args = "-Su" - -self.addrule("PACMAN_RETCODE=0") -self.addrule("PKG_EXIST=pacman") -self.addrule("PKG_VERSION=pacman|1.0-2") -self.addrule("PKG_EXIST=glibc-awesome") -self.addrule("PKG_VERSION=glibc-awesome|2.13-2") -self.addrule("PKG_EXIST=zlib") - -self.expectfailure = True diff --git a/test/pacman/tests/sync304.py b/test/pacman/tests/sync304.py deleted file mode 100644 index 4ac1a01..0000000 --- a/test/pacman/tests/sync304.py +++ /dev/null @@ -1,27 +0,0 @@ -self.description = "Sysupgrade: upgrade pacman being depended on" - -sp = pmpkg("pacman", "4.0.1-1") -self.addpkg2db("sync", sp) - -sp2 = pmpkg("pyalpm", "2-1") -sp2.depends = ["pacman>=4.0", "pacman<4.1"] -self.addpkg2db("sync", sp2) - -lp = pmpkg("pacman", "3.5.4-1") -self.addpkg2db("local", lp) - -lp2 = pmpkg("pyalpm", "1-1") -lp2.depends = ["pacman>=3.5", "pacman<3.6"] -self.addpkg2db("local", lp2) - -self.option["SyncFirst"] = ["pacman"] - -self.args = "-Su" - -self.addrule("PACMAN_RETCODE=0") -self.addrule("PKG_EXIST=pacman") -self.addrule("PKG_VERSION=pacman|4.0.1-1") -self.addrule("PKG_EXIST=pyalpm") -self.addrule("PKG_VERSION=pyalpm|2-1") - -self.expectfailure = True diff --git a/test/pacman/tests/sync305.py b/test/pacman/tests/sync305.py deleted file mode 100644 index 24fcee4..0000000 --- a/test/pacman/tests/sync305.py +++ /dev/null @@ -1,67 +0,0 @@ -self.description = "Sysupgrade: syncfirst with recursive/cascading deps" - -sp = pmpkg("pacman", "4.0.1-2") -sp.depends = ["glibc>=2.15", "curl"] -self.addpkg2db("sync", sp) - -glibcdep = pmpkg("glibc", "2.15-1") -self.addpkg2db("sync", glibcdep) - -gcldep = pmpkg("gcc-libs", "4.6.2-5") -gcldep.depends = ["glibc>=2.14"] -self.addpkg2db("sync", gcldep) - -curldep = pmpkg("curl", "7.23.1-2") -curldep.depends = ["openssl"] -self.addpkg2db("sync", curldep) - -openssldep = pmpkg("openssl", "1.0.0.e-1") -openssldep.depends = ["perl"] -self.addpkg2db("sync", openssldep) - -gccdep = pmpkg("gcc", "4.6.2-5") -gccdep.depends = ["gcc-libs=4.6.2-5"] -self.addpkg2db("sync", gccdep) - -perldep = pmpkg("perl", "5.14.2-5") -perldep.depends = ["db"] -self.addpkg2db("sync", perldep) - -dbdep = pmpkg("db", "5.2.36-2") -dbdep.depends = ["gcc-libs"] -self.addpkg2db("sync", dbdep) - - -lp = pmpkg("pacman", "4.0.1-1") -lp.depends = ["glibc>=2.14", "curl"] -self.addpkg2db("local", lp) - -lp2 = pmpkg("glibc", "2.14-2") -self.addpkg2db("local", lp2) - -lp3 = pmpkg("curl", "7.23.1-2") -self.addpkg2db("local", lp3) - -lp4 = pmpkg("gcc-libs", "4.6.2-3") -self.addpkg2db("local", lp4) - -lp5 = pmpkg("gcc", "4.6.2-3") -lp5.depends = ["gcc-libs=4.6.2-3"] -self.addpkg2db("local", lp5) - -lp6 = pmpkg("perl", "5.14.2-5") -lp6.depends = ["db"] -self.addpkg2db("local", lp6) - -lp7 = pmpkg("db", "5.2.36-2") -lp7.depends = ["gcc-libs"] -self.addpkg2db("local", lp7) - -self.option["SyncFirst"] = ["pacman"] - -self.args = "-Su" -self.addrule("PACMAN_RETCODE=0") -self.addrule("PKG_EXIST=pacman") -self.addrule("PKG_VERSION=pacman|4.0.1-2") - -self.expectfailure = True -- 1.7.9

7 6

[pacman-dev] SyncFirst
by Allan McRae 16 Feb '12

16 Feb '12

I was thinking about SyncFirst today and decided we need a good summary of what the issues are and why the current and old implementations fail. Why the current (pacman-4.0) implementation fails: When a package in SyncFirst is to be updated, pacman will update that first and pull everything in its dependency tree that needs updated. If a package not being updated has a strict versioned dependency on a package that is being updated, this results in an error. e.g. :: The following packages should be upgraded first : pacman :: Do you want to cancel the current operation :: and upgrade these packages now? [Y/n] resolving dependencies... looking for inter-conflicts... error: failed to prepare transaction (could not satisfy dependencies) :: gcc: requires gcc-libs=4.6.2-6 Here pacman tries to pull the gcc-libs update as a dependency of the SyncFirst package (pacman). gcc requires a specific version of gcc-libs so this update fails. Q. If this does not involve provides, why has this only been reported with multilib? A. multilib users are stupid. Why the old (pacman-3.5) implementation fails: The SyncFirst packages are updated on their own and only the dependencies it explicitly requires. This can cause failures as if an update of a dependency is not pulled and the package in SyncFirst really needs those updates too. e.g. issues that occurred when pacman was updated and glibc was not but pacman required symbols in the newer glibc. This can be partly worked around by using versioned dependencies, but that can lead to the same issue. e.g. if a new pacman release is made just after gcc-4.7 is released and we add a versioned dep on gcc-libs>=4.7, we end in exactly the same situation as current. So how could we fix this? Here is my proposal... It may be impossible to implement: Firstly, do not split then stop the transaction when hitting a SyncFirst package. Instead do all downloads/conflict checks/dependency checks and then in the first instance install the packages that currently are installed in SyncFirst (i.e. the SyncFirst package and all its deps that need updated) ignoring dependency issues and then - without stopping - install the rest of update. Would that be possible? Allan

1 0

[pacman-dev] [PATCH] Fix typo in help message
by Eric Bélanger 16 Feb '12

16 Feb '12

Close FS#28434 Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> --- contrib/pacsysclean.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/contrib/pacsysclean.in b/contrib/pacsysclean.in index 17f7681..28c1493 100755 --- a/contrib/pacsysclean.in +++ b/contrib/pacsysclean.in @@ -13,7 +13,7 @@ usage() { echo "Usage: $myname [options]" echo echo "Options:" - echo " -o <options> Specify custom pacman query options (e.g., dt)" + echo " -o <options> Specify custom pacman query options (e.g., -dt)" echo " -h, --help Show this help message and exit" } -- 1.7.9.1

2 2

[pacman-dev] [PATCH] pacsysclean: Fix script description and accept -o option without hyphen
by Eric Bélanger 16 Feb '12

16 Feb '12

Close FS#28434 Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> --- contrib/pacsysclean.in | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/contrib/pacsysclean.in b/contrib/pacsysclean.in index 17f7681..162530e 100755 --- a/contrib/pacsysclean.in +++ b/contrib/pacsysclean.in @@ -1,6 +1,6 @@ #!/bin/bash -# pacsysclean - Sort installed packages by decreasing installed size. Useful for system clean-up. +# pacsysclean - Sort installed packages by increasing installed size. Useful for system clean-up. declare -r myname='pacsysclean' declare -r myver='@PACKAGE_VERSION@' @@ -8,7 +8,7 @@ declare -r myver='@PACKAGE_VERSION@' PACMAN_OPTS= usage() { - echo "$myname - Sort installed packages by decreasing installed size." + echo "$myname - Sort installed packages by increasing installed size." echo echo "Usage: $myname [options]" echo @@ -35,6 +35,9 @@ fi IFS=$'\n' name="^Name.*: (.*)$" size="^Installed Size.*: (.*) KiB$" + +[[ $PACMAN_OPTS != -* ]] && PACMAN_OPTS="-$PACMAN_OPTS" + for line in $(LANG=C pacman -Qi $PACMAN_OPTS); do if [[ $line =~ $name ]]; then printf "%s\t" ${BASH_REMATCH[1]} -- 1.7.9.1

1 0

[pacman-dev] [PATCH 1/3] makepkg: restrict usage of errexit to user functions
by Dave Reisner 16 Feb '12

16 Feb '12

It's expected that this will lead to unwanted behavior, and needs widespread testing. It's desirable to commit this for a few reasons: - there's no reason we can't do our own error checking for code that we write. - it avoids the need for ||true hacks scattered about in the code. - it makes us immune to upstream changes in exit codes (FS#28248) Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- Allan, just making sure we're on the same page -- this _will_ cause breakage, and the next patch in this series addresses one specific case. I figure getting this patch in now gives us "ample time" to uncover and fix all these before the next release. scripts/makepkg.sh.in | 47 +++++++++++++++++++++++------------------------ 1 files changed, 23 insertions(+), 24 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index f0a2252..61c95af 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1,4 +1,4 @@ -#!/bin/bash -e +#!/bin/bash # # makepkg - make packages compatible for use with pacman # @configure_input@ @@ -430,13 +430,10 @@ run_pacman() { check_deps() { (( $# > 0 )) || return 0 - # Disable error trap in pacman subshell call as this breaks bash-3.2 compatibility - # Also, a non-zero return value is not unexpected and we are manually dealing them - set +E local ret=0 local pmout - pmout=$(run_pacman -T "$@") || ret=$? - set -E + pmout=$(run_pacman -T "$@") + ret=$? if (( ret == 127 )); then #unresolved deps echo "$pmout" @@ -469,13 +466,7 @@ handle_deps() { fi # we might need the new system environment - # avoid triggering the ERR trap and exiting - set +e - local restoretrap=$(trap -p ERR) - trap - ERR source /etc/profile &>/dev/null - eval $restoretrap - set -e return $R_DEPS_SATISFIED } @@ -867,6 +858,23 @@ error_function() { exit 2 # $E_BUILD_FAILED } +run_function_safe() { + local restoretrap + + set -e + set -E + + restoretrap=$(trap -p ERR) + trap 'error_function $pkgfunc' ERR + + run_function "$1" + + eval $restoretrap + + set +E + set +e +} + run_function() { if [[ -z $1 ]]; then return 1 @@ -892,7 +900,6 @@ run_function() { local shellopts=$(shopt -p) local ret=0 - local restoretrap if (( LOGGING )); then local fullver=$(get_full_version) local BUILDLOG="${startdir}/${pkgbase}-${fullver}-${CARCH}-$pkgfunc.log" @@ -914,18 +921,12 @@ run_function() { tee "$BUILDLOG" < "$logpipe" & local teepid=$! - restoretrap=$(trap -p ERR) - trap 'error_function $pkgfunc' ERR $pkgfunc &>"$logpipe" - eval $restoretrap wait $teepid rm "$logpipe" else - restoretrap=$(trap -p ERR) - trap 'error_function $pkgfunc' ERR $pkgfunc 2>&1 - eval $restoretrap fi # reset our shell options eval "$shellopts" @@ -943,11 +944,11 @@ run_build() { [[ -d /usr/lib/ccache/bin ]] && export PATH="/usr/lib/ccache/bin:$PATH" fi - run_function "build" + run_function_safe "build" } run_check() { - run_function "check" + run_function_safe "check" } run_package() { @@ -958,7 +959,7 @@ run_package() { pkgfunc="package_$1" fi - run_function "$pkgfunc" + run_function_safe "$pkgfunc" } tidy_install() { @@ -1973,8 +1974,6 @@ for signal in TERM HUP QUIT; do trap "trap_exit \"$(gettext "%s signal caught. Exiting...")\" \"$signal\"" "$signal" done trap 'trap_exit "$(gettext "Aborted by user! Exiting...")"' INT -trap 'trap_exit "$(gettext "An unknown error has occurred. Exiting...")"' ERR -set -E # preserve environment variables and canonicalize path [[ -n ${PKGDEST} ]] && _PKGDEST=$(canonicalize_path ${PKGDEST}) -- 1.7.9

2 7

[pacman-dev] Move package to cache when installed with -U
by jjacky 16 Feb '12

16 Feb '12

Hey, So I would be interested in such a feature, and I found it being rejected as FS#15143, but I have some questions. It seems the main reason it was rejected was this: " My second argument against this is that users sometimes do local rebuild of official packages, and maybe don't want to mix these packages with official ones in the cache (which could cause integrity check failures next time they upgrade their system). " And I don't understand. Why/how would there be an integrity check failure on upgrade ? I thought integrity check meant that the package(s) about to be installed was being checked. So, during an upgrade, there would be no reason to check this already installed package, no? And if there was an update available, it's the integrity of the newly downloaded package that would be checked, and it would have no reason to fail. What am I not understanding/misunderstanding here? Because I do like this idea and, unless there is an inherent problem with it of course, I might be interested into looking to make a patch to add such an option. Thanks, -jacky Ref: https://bugs.archlinux.org/task/15143

2 4

[pacman-dev] [PATCH 1/2] Revert "Enable recursive/needed sync on SyncFirst"
by Dan McGee 15 Feb '12

15 Feb '12

This reverts commit 09034520325efcc2e684f05fa7a99c02bad1f5be. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- src/pacman/sync.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 4f10e6b..fcc887a 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -963,8 +963,6 @@ int pacman_sync(alpm_list_t *targets) FREELIST(targs); targs = packages; config->flags = 0; - config->flags |= ALPM_TRANS_FLAG_RECURSE; - config->flags |= ALPM_TRANS_FLAG_NEEDED; config->op_s_upgrade = 0; } else { FREELIST(packages); -- 1.7.9

1 1

[pacman-dev] macros needed when using libalpm
by jjacky 15 Feb '12

15 Feb '12

Hi, Just a quick question, it might be pretty obvious but I'm still relatively new at this, so excuse my "noobness." While working on a little app using libalpm, I wanted to use the download callback. But I had a problem, because the total size would always be zero. I didn't understand why it didn't work, especially since it did for pacman, which seemed to do exactly the same as I did. After investigation, I figured out that this was because I needed to use a macro when compiling, namely: #define _FILE_OFFSET_BITS 64 Apparently one of the things this does is turn off_t (type of both size parameters of the dl callback, among other things) into off64_t. I'm guessing that means one more byte to store the data, and therefore explains why with my "regular" off_t I didn't get the correct values. Thing is, I'm not sure how I was supposed to know that using this macro was required of me in order to get things to work properly, so my questions are: - how was I supposed to know? :) As in, is there any indication or something about this written somewhere that I missed? I did look at the README and such, but couldn't find anything. (and if not, shouldn't there be, maybe?) Or is this just usual/common knowledge or something? - any chance there is/are other such things I need to use for things to work properly? I'm guessing not, but just in case... Thanks, -jacky

2 2

[pacman-dev] [PATCH] scripts: unset CDPATH if cd is used
by Dan McGee 14 Feb '12

14 Feb '12

This wonderful/awful little bash shell variable wrecks havoc on `cd` calls in shell scripts. Unset CDPATH in makepkg where we use `cd` quite heavily. In pacman-optimize, we can move the change directory logic into the bsdtar call so we are left with no usages of `cd` in the script. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- scripts/makepkg.sh.in | 2 ++ scripts/pacman-optimize.sh.in | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 80bb1c9..5e8687e 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -36,6 +36,8 @@ export TEXTDOMAINDIR='@localedir@' # file -i does not work on Mac OSX unless legacy mode is set export COMMAND_MODE='legacy' +# Ensure CDPATH doesn't screw with our cd calls +unset CDPATH myver='@PACKAGE_VERSION@' confdir='@sysconfdir@' diff --git a/scripts/pacman-optimize.sh.in b/scripts/pacman-optimize.sh.in index 47d8814..8a4e722 100644 --- a/scripts/pacman-optimize.sh.in +++ b/scripts/pacman-optimize.sh.in @@ -122,8 +122,7 @@ find "$dbroot" -type f | sort | xargs md5sum > "$workdir/pacsums.old" # step 2: tar it up msg "$(gettext "Tar'ing up %s...")" "$dbroot" -cd "$dbroot" -bsdtar -czf "$workdir/pacman-db.tar.gz" ./ +bsdtar -czf "$workdir/pacman-db.tar.gz" -C "$dbroot" ./ if (( $? )); then rm -rf "$workdir" die_r "$(gettext "Tar'ing up %s failed.")" "$dbroot" -- 1.7.9

2 1