- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Highlight new dependencies brought in by an upgrade
by Connor Behan 16 Jul '13

16 Jul '13

Users trying to keep a lightweight system often scan the list of targets for red flags. This just makes it easier for them. Signed-off-by: Connor Behan <connor.behan(a)gmail.com> --- src/pacman/util.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 23c4009..f3202f7 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -909,8 +909,14 @@ static void _display_targets(alpm_list_t *targets, int verbose) } if(target->install) { - pm_asprintf(&str, "%s-%s", alpm_pkg_get_name(target->install), - alpm_pkg_get_version(target->install)); + if(!target->remove && config->op_s_upgrade) { + const colstr_t *colstr = &config->colstr; + pm_asprintf(&str, "%s%s-%s%s", colstr->title, alpm_pkg_get_name(target->install), + alpm_pkg_get_version(target->install), colstr->nocolor); + } else { + pm_asprintf(&str, "%s-%s", alpm_pkg_get_name(target->install), + alpm_pkg_get_version(target->install)); + } } else if(isize == 0) { pm_asprintf(&str, "%s-%s", alpm_pkg_get_name(target->remove), alpm_pkg_get_version(target->remove)); -- 1.8.3.2

2 3

[pacman-dev] Fix for FS#36097
by Ashley Whetter 15 Jul '13

15 Jul '13

Hey everyone, I've attached (and pasted below) a couple of possible patches that fix FS#36097 (Wrong exit code for `pacman -Sg`). >From 045b58ada05747c6743e8bf68e7e7d8156016eee Mon Sep 17 00:00:00 2001 From: Ashley Whetter <awhetter.2011(a)my.bristol.ac.uk> Date: Fri, 12 Jul 2013 00:15:15 +0100 Subject: [PATCH] Sg flag now returns correct return value for errors sync_group now returns non-zero if no groups are found in the (non-empty) list of groups to search for Fixes FS#36097 Signed-off-by: Ashley Whetter <awhetter.2011(a)my.bristol.ac.uk> --- src/pacman/sync.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index fc1314b..af26ae4 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -367,6 +367,7 @@ static int sync_search(alpm_list_t *syncs, alpm_list_t *targets) static int sync_group(int level, alpm_list_t *syncs, alpm_list_t *targets) { alpm_list_t *i, *j, *k, *s = NULL; + int found_group = 0; if(targets) { for(i = targets; i; i = alpm_list_next(i)) { @@ -376,6 +377,7 @@ static int sync_group(int level, alpm_list_t *syncs, alpm_list_t *targets) alpm_group_t *grp = alpm_db_get_group(db, grpname); if(grp) { + found_group = 1; /* get names of packages in group */ for(k = grp->packages; k; k = alpm_list_next(k)) { if(!config->quiet) { @@ -396,6 +398,8 @@ static int sync_group(int level, alpm_list_t *syncs, alpm_list_t *targets) alpm_group_t *grp = j->data; if(level > 1) { + found_group |= (int)(intptr_t) grp->packages; + for(k = grp->packages; k; k = alpm_list_next(k)) { printf("%s %s\n", grp->name, alpm_pkg_get_name(k->data)); @@ -403,6 +407,7 @@ static int sync_group(int level, alpm_list_t *syncs, alpm_list_t *targets) } else { /* print grp names only, no package names */ if(!alpm_list_find_str (s, grp->name)) { + found_group = 1; s = alpm_list_add (s, grp->name); printf("%s\n", grp->name); } @@ -412,7 +417,7 @@ static int sync_group(int level, alpm_list_t *syncs, alpm_list_t *targets) alpm_list_free(s); } - return 0; + return (found_group == 0); } static int sync_info(alpm_list_t *syncs, alpm_list_t *targets) -- 1.8.3.2 >From 2b36585f5aeca8adbe15fc4609ff4bc5536af798 Mon Sep 17 00:00:00 2001 From: Ashley Whetter <awhetter.2011(a)my.bristol.ac.uk> Date: Fri, 12 Jul 2013 00:35:55 +0100 Subject: [PATCH] Sg flag now returns correct return value for errors MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit sync_group now returns non-zero if no groups are found in the (non-empty) list of groups to search for Fixes FS#36097 Signed-off-by: Ashley Whetter <awhetter.2011(a)my.bristol.ac.uk> --- src/pacman/sync.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index fc1314b..9d2dbd6 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -367,6 +367,7 @@ static int sync_search(alpm_list_t *syncs, alpm_list_t *targets) static int sync_group(int level, alpm_list_t *syncs, alpm_list_t *targets) { alpm_list_t *i, *j, *k, *s = NULL; + int found = 0; if(targets) { for(i = targets; i; i = alpm_list_next(i)) { @@ -376,6 +377,7 @@ static int sync_group(int level, alpm_list_t *syncs, alpm_list_t *targets) alpm_group_t *grp = alpm_db_get_group(db, grpname); if(grp) { + found = 1; /* get names of packages in group */ for(k = grp->packages; k; k = alpm_list_next(k)) { if(!config->quiet) { @@ -410,9 +412,13 @@ static int sync_group(int level, alpm_list_t *syncs, alpm_list_t *targets) } } alpm_list_free(s); + + /* Even if there are no groups we have still done everything we should + * have */ + found = 1; } - return 0; + return (found == 0); } static int sync_info(alpm_list_t *syncs, alpm_list_t *targets) -- 1.8.3.2 With the first patch, the new double cast line is a bit weird but genuinely flags whether or not we found any groups. The second patch seems a bit more sane to me in terms of the functionality. It just marks there to be a group found if the user didn't search for a specific group, regardless of whether any groups were actually found. I think this makes sense because in the highly unlikely scenario that there are no groups and the user didn't search for any specifically, pacman has still done everything it should have done so shouldn't return an error. Regards, Ashley

4 4

[pacman-dev] [PATCH] Clarify inter-conflicts message
by Allan McRae 15 Jul '13

15 Jul '13

Use a clear message ather than using a made up work to describe what we are doing. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/callback.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index c57ef34..d0b7c40 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -169,7 +169,7 @@ void cb_event(alpm_event_t event, void *data1, void *data2) printf(_("resolving dependencies...\n")); break; case ALPM_EVENT_INTERCONFLICTS_START: - printf(_("looking for inter-conflicts...\n")); + printf(_("looking for conflicting packages...\n")); break; case ALPM_EVENT_ADD_START: if(config->noprogressbar) { -- 1.8.3.2

2 1

[pacman-dev] [PATCH] Do not refer to FlySpray numbers
by Allan McRae 15 Jul '13

15 Jul '13

These references to bug numbers assume we will forever be using that bug tracker and all did not provide any information beyond the comment and commit message. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Left that FS numbers in the test suite as that requries a much larger clean-up. lib/libalpm/add.c | 2 +- lib/libalpm/dload.c | 2 +- scripts/makepkg.sh.in | 2 +- src/pacman/sync.c | 2 +- src/pacman/util.c | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 8ef9ef0..df39274 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -516,7 +516,7 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, } /* prepare directory for database entries so permission are correct after - changelog/install script installation (FS#12263) */ + changelog/install script installation */ if(_alpm_local_db_prepare(db, newpkg)) { alpm_logaction(handle, ALPM_CALLER_PREFIX, "error: could not create database entry %s-%s\n", diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 342afbc..8537b3d 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -466,7 +466,7 @@ static int curl_download_internal(struct dload_payload *payload, /* disconnect relationships from the curl handle for things that might go out * of scope, but could still be touched on connection teardown. This really - * only applies to FTP transfers. See FS#26327 for an example. */ + * only applies to FTP transfers. */ curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 1L); curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, (char *)NULL); diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 06f7c25..e95e9a0 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -389,7 +389,7 @@ download_file() { extract_file() { local file=$1 - # fix flyspray #6246 + # do not rely on extension for file type local file_type=$(file -bizL "$file") local ext=${file##*.} local cmd='' diff --git a/src/pacman/sync.c b/src/pacman/sync.c index fc1314b..04c8f86 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -639,7 +639,7 @@ static int process_targname(alpm_list_t *dblist, const char *targname, { alpm_pkg_t *pkg = alpm_find_dbs_satisfier(config->handle, dblist, targname); - /* #FS#23342 - skip ignored packages when user says no */ + /* skip ignored packages when user says no */ if(alpm_errno(config->handle) == ALPM_ERR_PKG_IGNORED) { pm_printf(ALPM_LOG_WARNING, _("skipping target: %s\n"), targname); return 0; diff --git a/src/pacman/util.c b/src/pacman/util.c index 23c4009..9eb0042 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1094,7 +1094,7 @@ double humanize_size(off_t bytes, const char target_unit, int precision, *label = labels[index]; } - /* fix FS#27924 so that it doesn't display negative zeroes */ + /* do not display negative zeroes */ if(precision >= 0 && val < 0.0 && val > (-0.5 / simple_pow(10, precision))) { val = 0.0; @@ -1531,7 +1531,7 @@ static int question(short preset, const char *format, va_list args) } /* if stdin is piped, response does not get printed out, and as a result - * a \n is missing, resulting in broken output (FS#27909) */ + * a \n is missing, resulting in broken output */ if(!isatty(fd_in)) { fprintf(stream, "%s\n", response); } -- 1.8.3.2

2 2

[pacman-dev] [PATCH] clarified descriptions for pactree -r (--help and pactree(8))
by Zulker Nayeen Nahiyan 15 Jul '13

15 Jul '13

Signed-off-by: Zulker Nayeen Nahiyan <nahiyan02(a)gmail.com> --- doc/pactree.8.txt | 2 +- src/util/pactree.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/pactree.8.txt b/doc/pactree.8.txt index 6ecaf23..0e9f733 100644 --- a/doc/pactree.8.txt +++ b/doc/pactree.8.txt @@ -48,7 +48,7 @@ Options Prints package names at the start of each line, one per line. *-r, \--reverse*:: - Show packages that depend on the named package. + Show packages that depend on the named package instead. *-s, \--sync*:: Read package data from sync databases instead of local database. diff --git a/src/util/pactree.c b/src/util/pactree.c index 33cf66c..3b4eb9e 100644 --- a/src/util/pactree.c +++ b/src/util/pactree.c @@ -319,7 +319,7 @@ static void usage(void) " -g, --graph generate output for graphviz's dot\n" " -h, --help display this help message\n" " -l, --linear enable linear output\n" - " -r, --reverse show reverse dependencies\n" + " -r, --reverse list packages that depend on PACKAGE instead\n" " -s, --sync search sync DBs instead of local\n" " -u, --unique show dependencies with no duplicates (implies -l)\n" " --config <path> set an alternate configuration file\n"); -- 1.8.3.2

3 6

[pacman-dev] [PATCH] makedeps and checkdeps are now installed together
by awhetter.2011＠my.bristol.ac.uk 15 Jul '13

15 Jul '13

From: Ashley Whetter <awhetter.2011(a)my.bristol.ac.uk> Thanks for the feedback on my last patch. I've updated the patch and included the recommended changes here. I dedcided to quote the arrays because it doesn't really cost anything to do it anyway. Regards, Ashley P.S. Hopefully I've used git send-email properly here! I tried to reply to the original thread but I don't think I can do it because I didn't use send-email the first time. Ashley Whetter (1): makedeps and checkdeps are now installed together scripts/makepkg.sh.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 1.8.3.2

2 2

[pacman-dev] [PATCH] Removed installed optional dependencies from post-installation listing
by Drew DeVault 13 Jul '13

13 Jul '13

Per feedback on prior patch. My only concern here is that I'm not particularly familiar with how localization works, and I don't know if my changes will affect that. --- src/pacman/util.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 23c4009..ab94629 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1243,14 +1243,16 @@ void display_optdepends(alpm_pkg_t *pkg) optdeps = alpm_pkg_get_optdepends(pkg); - /* turn optdepends list into a text list */ + /* turn uninstalled optdepends list into a text list */ for(i = optdeps; i; i = alpm_list_next(i)) { alpm_depend_t *optdep = i->data; - optstrings = alpm_list_add(optstrings, make_optstring(optdep)); + if(alpm_db_get_pkg(alpm_get_localdb(config->handle), optdep->name) == 0) { + optstrings = alpm_list_add(optstrings, make_optstring(optdep)); + } } if(optstrings) { - printf(_("Optional dependencies for %s\n"), alpm_pkg_get_name(pkg)); + printf(_("Remaining optional dependencies for %s:\n"), alpm_pkg_get_name(pkg)); unsigned short cols = getcols(fileno(stdout)); list_display_linebreak(" ", optstrings, cols); } -- 1.8.3.2

2 1

[pacman-dev] [PATCH] Group optional dependencies by installation status
by Drew DeVault 12 Jul '13

12 Jul '13

Not sure how expensive alpm_db_get_pkg is, so it might be worthwhile to use something other than make_optstring to accomplish this if we want to avoid calling it four times per package. Signed-off-by: Drew DeVault <sir(a)cmpwn.com> --- src/pacman/util.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 23c4009..c1d3dab 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1243,10 +1243,19 @@ void display_optdepends(alpm_pkg_t *pkg) optdeps = alpm_pkg_get_optdepends(pkg); - /* turn optdepends list into a text list */ + /* turn optdepends list into a text list, with uninstalled dependencies last */ for(i = optdeps; i; i = alpm_list_next(i)) { alpm_depend_t *optdep = i->data; - optstrings = alpm_list_add(optstrings, make_optstring(optdep)); + if(alpm_db_get_pkg(alpm_get_localdb(config->handle), optdep->name) != 0) { + optstrings = alpm_list_add(optstrings, make_optstring(optdep)); + } + } + + for(i = optdeps; i; i = alpm_list_next(i)) { + alpm_depend_t *optdep = i->data; + if(alpm_db_get_pkg(alpm_get_localdb(config->handle), optdep->name) == 0) { + optstrings = alpm_list_add(optstrings, make_optstring(optdep)); + } } if(optstrings) { -- 1.8.3.2

3 9

[pacman-dev] Patch for FS#31557
by Ashley Whetter 11 Jul '13

11 Jul '13

Hey everyone, I've made a fix for issue FS#31557 (Merge installing makedepends and checkdepends). I've attached the patch and pasted it below: >From 447ba301bd9d24d3b60dd02d6382f64965ad7878 Mon Sep 17 00:00:00 2001 From: Ashley Whetter <awhetter.2011(a)my.bristol.ac.uk> Date: Wed, 10 Jul 2013 22:44:55 +0100 Subject: [PATCH] makedeps and checkdeps are now installed together Fixes FS#31557 Signed-off-by: Ashley Whetter <awhetter.2011(a)my.bristol.ac.uk> --- scripts/makepkg.sh.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 2a39157..4de0d34 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2952,11 +2952,12 @@ else fi msg "$(gettext "Checking buildtime dependencies...")" - resolve_deps ${makedepends[@]} || deperr=1 + build_depends=("${makedepends[@]}") if (( CHECKFUNC )); then - resolve_deps ${checkdepends[@]} || deperr=1 + build_depends+=("${checkdepends[@]}") fi + resolve_deps ${build_depends[@]} || deperr=1 if (( RMDEPS )); then current_pkglist=($(run_pacman -Qq)) # required by remove_deps -- 1.8.3.2 Regards, Ashley

5 6

[pacman-dev] [PATCH 0/5] Use more auto in autotools
by Allan McRae 10 Jul '13

10 Jul '13

The use of autotools in pacman is interesting... We commit most autotools generated files, but not configure or Makefile. One reason for this is that we needed to patch ltmain.sh to properly handle -Wl,-as-needed, because the Arch package maintainer refused to do so unless upstream accepts! Libtool upstream have known about the bug since at least 2006, so that does not look hopeful. The new approach is to have autogen.sh call autoreconf and then have it patch the ltmain.sh file. This removes a lot of crap that should be autogenerated from our git repo: 38 files changed, 83 insertions(+), 28256 deletions(-) Allan McRae (5): Remove autotools files Update gitignore files for use with autoreconf Use autoreconf in autogen.sh Patch ltmain on autoreconf Remove autotools files with autoclean.sh .gitignore | 1 + autoclean.sh | 18 +- autogen.sh | 6 +- build-aux/.gitignore | 2 + build-aux/compile | 347 -- build-aux/config.guess | 1558 ------- build-aux/config.rpath | 614 --- build-aux/config.sub | 1788 -------- build-aux/depcomp | 791 ---- build-aux/install-sh | 527 --- build-aux/ltmain-asneeded.patch | 33 + build-aux/ltmain.sh | 9672 --------------------------------------- build-aux/missing | 215 - build-aux/mkinstalldirs | 162 - configure.ac | 2 +- lib/libalpm/po/.gitignore | 10 +- lib/libalpm/po/Makefile.in.in | 444 -- m4/.gitignore | 2 + m4/gettext.m4 | 383 -- m4/gpgme.m4 | 307 -- m4/iconv.m4 | 214 - m4/intlmacosx.m4 | 51 - m4/lib-ld.m4 | 110 - m4/lib-link.m4 | 774 ---- m4/lib-prefix.m4 | 224 - m4/libtool.m4 | 7831 ------------------------------- m4/ltoptions.m4 | 369 -- m4/ltsugar.m4 | 123 - m4/ltversion.m4 | 23 - m4/lt~obsolete.m4 | 98 - m4/nls.m4 | 32 - m4/pkg.m4 | 159 - m4/po.m4 | 449 -- m4/progtest.m4 | 92 - scripts/po/.gitignore | 10 +- scripts/po/Makefile.in.in | 444 -- src/pacman/po/.gitignore | 10 +- src/pacman/po/Makefile.in.in | 444 -- 38 files changed, 83 insertions(+), 28256 deletions(-) create mode 100644 build-aux/.gitignore delete mode 100755 build-aux/compile delete mode 100755 build-aux/config.guess delete mode 100755 build-aux/config.rpath delete mode 100755 build-aux/config.sub delete mode 100755 build-aux/depcomp delete mode 100755 build-aux/install-sh create mode 100644 build-aux/ltmain-asneeded.patch delete mode 100644 build-aux/ltmain.sh delete mode 100755 build-aux/missing delete mode 100755 build-aux/mkinstalldirs delete mode 100644 lib/libalpm/po/Makefile.in.in create mode 100644 m4/.gitignore delete mode 100644 m4/gettext.m4 delete mode 100644 m4/gpgme.m4 delete mode 100644 m4/iconv.m4 delete mode 100644 m4/intlmacosx.m4 delete mode 100644 m4/lib-ld.m4 delete mode 100644 m4/lib-link.m4 delete mode 100644 m4/lib-prefix.m4 delete mode 100644 m4/libtool.m4 delete mode 100644 m4/ltoptions.m4 delete mode 100644 m4/ltsugar.m4 delete mode 100644 m4/ltversion.m4 delete mode 100644 m4/lt~obsolete.m4 delete mode 100644 m4/nls.m4 delete mode 100644 m4/pkg.m4 delete mode 100644 m4/po.m4 delete mode 100644 m4/progtest.m4 delete mode 100644 scripts/po/Makefile.in.in delete mode 100644 src/pacman/po/Makefile.in.in -- 1.8.3.1

4 19