From 8152077f6d923f5ff432175a3f86f232fd75919f Mon Sep 17 00:00:00 2001 From: "Marc - A. Dahlhaus" Date: Mon, 3 Aug 2009 13:59:43 +0200 Subject: Use full path to ldconfig If /sbin is not in the PATH and sudo is used, ldconfig cannot be found. So use /sbin/ldconfig instead. The code checked for the existence of /sbin/ldconfig anyway.. Signed-off-by: Marc - A. Dahlhaus Signed-off-by: Xavier Chantry Signed-off-by: Dan McGee --- lib/libalpm/util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index e56efb17..0aa05b28 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -562,7 +562,7 @@ int _alpm_ldconfig(const char *root) if(access(line, F_OK) == 0) { snprintf(line, PATH_MAX, "%ssbin/ldconfig", root); if(access(line, X_OK) == 0) { - _alpm_run_chroot(root, "ldconfig"); + _alpm_run_chroot(root, "/sbin/ldconfig"); } } -- cgit v1.2.3-24-g4f1b From 4fa6f262a66336240b6e792955dcd38f04753bf2 Mon Sep 17 00:00:00 2001 From: Xavier Chantry Date: Tue, 28 Jul 2009 17:07:51 +0200 Subject: Add a missing newline. Signed-off-by: Xavier Chantry Signed-off-by: Dan McGee --- lib/libalpm/util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 0aa05b28..082c095b 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -509,7 +509,7 @@ int _alpm_run_chroot(const char *root, const char *cmd) umask(0022); pipe = popen(cmd, "r"); if(!pipe) { - _alpm_log(PM_LOG_ERROR, _("call to popen failed (%s)"), + _alpm_log(PM_LOG_ERROR, _("call to popen failed (%s)\n"), strerror(errno)); exit(1); } -- cgit v1.2.3-24-g4f1b From f16c7a4343c2e82d7ead0423c70495de5441b1ef Mon Sep 17 00:00:00 2001 From: Xavier Chantry Date: Sun, 2 Aug 2009 23:00:04 +0200 Subject: repo-add: clarify one message Signed-off-by: Xavier Chantry Signed-off-by: Dan McGee --- scripts/repo-add.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index d3566f5a..a1e5f7f4 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -301,7 +301,7 @@ check_repo_db() CLEAN_LOCK=1 else error "$(gettext "Failed to acquire lockfile: %s.")" "$LOCKFILE" - [ -f "$LOCKFILE" ] && error "$(gettext "Held by %s")" "$(cat $LOCKFILE)" + [ -f "$LOCKFILE" ] && error "$(gettext "Held by process %s")" "$(cat $LOCKFILE)" exit 1 fi -- cgit v1.2.3-24-g4f1b From 839bb562693d83aa61e996b492b731ff452a2bcd Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Sat, 8 Aug 2009 19:21:50 +1000 Subject: makepkg: change to pkgdir before creating PKGINFO file Commit 01f9ae63 moved that creation of the PKGINFO file to before changing to pkgdir. This causes issues when using the -R option (FS#15851). Signed-off-by: Allan McRae Signed-off-by: Dan McGee --- scripts/makepkg.sh.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 56ad2c0b..cd41c4aa 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -953,6 +953,9 @@ create_package() { exit 1 # $E_MISSING_PKGDIR fi + cd "$pkgdir" + msg "$(gettext "Creating package...")" + if [ -z "$1" ]; then nameofpkg="$pkgname" else @@ -961,9 +964,6 @@ create_package() { write_pkginfo $nameofpkg - cd "$pkgdir" - msg "$(gettext "Creating package...")" - local comp_files=".PKGINFO" # check for an install script -- cgit v1.2.3-24-g4f1b From ee43e75ed2e8b852f1ae140d8a619a39a90d8481 Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Fri, 7 Aug 2009 16:22:55 +1000 Subject: Remove builddeps from option parser Leftover from commit ae5ef3b9 Signed-off-by: Allan McRae Signed-off-by: Dan McGee --- scripts/makepkg.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index cd41c4aa..c8384f80 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1444,8 +1444,8 @@ fi ARGLIST=$@ # Parse Command Line Options. -OPT_SHORT="AbcCdefFghiLmop:rRsV" -OPT_LONG="allsource,asroot,ignorearch,builddeps,clean,cleancache,nodeps" +OPT_SHORT="AcCdefFghiLmop:rRsV" +OPT_LONG="allsource,asroot,ignorearch,clean,cleancache,nodeps" OPT_LONG="$OPT_LONG,noextract,force,forcever:,geninteg,help,holdver" OPT_LONG="$OPT_LONG,install,log,nocolor,nobuild,rmdeps,repackage,source" OPT_LONG="$OPT_LONG,syncdeps,version,config:" -- cgit v1.2.3-24-g4f1b From 6d00025c18e837f57a4f78ee232fe3d8f244f143 Mon Sep 17 00:00:00 2001 From: Nagy Gabor Date: Wed, 5 Aug 2009 23:31:10 +0200 Subject: Fix for FS#15810 Skip the SyncFirst dialog, if all the -S packages are SyncFirst packages. Signed-off-by: Nagy Gabor Signed-off-by: Xavier Chantry Signed-off-by: Dan McGee --- src/pacman/sync.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 4da65400..7bfe454b 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -837,18 +837,26 @@ int pacman_sync(alpm_list_t *targets) /* check for newer versions of packages to be upgraded first */ alpm_list_t *packages = syncfirst(); if(packages) { - 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->op_s_upgrade = 0; + /* 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->op_s_upgrade = 0; + } else { + FREELIST(packages); + } + printf("\n"); } else { + pm_printf(PM_LOG_DEBUG, "skipping SyncFirst dialog\n"); FREELIST(packages); } - printf("\n"); } } -- cgit v1.2.3-24-g4f1b