- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] pactest: fix when specifying scriptlet shell
by Allan McRae 20 Sep '12

20 Sep '12

When pacman is configured with --with-scriptlet-shell other than "sh", the two scriptlet pactests fail. This copies /bin/sh into /bin/<shell>, where <shell> is the specified shell, as the test rely on a sh compatible shell being used. Fixes FS#31552. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Makefile.am | 1 + test/pacman/pactest.py | 5 +++++ test/pacman/pmenv.py | 2 +- test/pacman/pmtest.py | 5 +++-- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 0f15ec5..37a3c20 100644 --- a/Makefile.am +++ b/Makefile.am @@ -29,6 +29,7 @@ check-local: test-pacman test-pacsort test-vercmp test-parseopts test-pacman: test/pacman src/pacman LC_ALL=C $(PYTHON) $(top_srcdir)/test/pacman/pactest.py --debug=1 \ --test $(top_srcdir)/test/pacman/tests/*.py \ + --scriptlet-shell $(SCRIPTLET_SHELL) \ -p $(top_builddir)/src/pacman/pacman test-pacsort: test/util src/util diff --git a/test/pacman/pactest.py b/test/pacman/pactest.py index 2fb64ed..fcad160 100755 --- a/test/pacman/pactest.py +++ b/test/pacman/pactest.py @@ -3,6 +3,7 @@ # pactest : run automated testing on the pacman binary # # Copyright (c) 2006 by Aurelien Foret <orelien(a)chez.com> +# Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -81,6 +82,9 @@ def create_parser(): parser.add_option("--manual-confirm", action = "store_true", dest = "manualconfirm", default = False, help = "do not use --noconfirm for pacman calls") + parser.add_option("--scriptlet-shell", type = "string", + dest = "scriptletshell", default = "sh", + help = "specify shell used for install scriptlets") return parser @@ -99,6 +103,7 @@ def create_parser(): env.pacman["gdb"] = opts.gdb env.pacman["valgrind"] = opts.valgrind env.pacman["manual-confirm"] = opts.manualconfirm + env.pacman["scriptlet-shell"] = opts.scriptletshell if opts.testcases is None or len(opts.testcases) == 0: print "no tests defined, nothing to do" diff --git a/test/pacman/pmenv.py b/test/pacman/pmenv.py index 0e455ce..04948c1 100644 --- a/test/pacman/pmenv.py +++ b/test/pacman/pmenv.py @@ -66,7 +66,7 @@ def run(self): print t.description print "----------"*8 - t.generate() + t.generate(self.pacman) t.run(self.pacman) diff --git a/test/pacman/pmtest.py b/test/pacman/pmtest.py index 00a0b96..b69275b 100644 --- a/test/pacman/pmtest.py +++ b/test/pacman/pmtest.py @@ -1,6 +1,7 @@ #! /usr/bin/python2 # # Copyright (c) 2006 by Aurelien Foret <orelien(a)chez.com> +# Copyright (c) 2006-2012 Pacman Development Team <pacman-dev(a)archlinux.org> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -102,7 +103,7 @@ def load(self): else: raise IOError("file %s does not exist!" % self.name) - def generate(self): + def generate(self, pacman): print "==> Generating test environment" # Cleanup leftover files from a previous test session @@ -126,7 +127,7 @@ def generate(self): vprint("\t%s" % sys_dir[len(self.root)+1:]) os.makedirs(sys_dir, 0755) # Only the dynamically linked binary is needed for fakechroot - shutil.copy("/bin/sh", bindir) + shutil.copy("/bin/sh", os.path.join(sbindir, pacman["scriptlet-shell"])) shutil.copy(os.path.join(util.SELFPATH, "ldconfig.stub"), os.path.join(sbindir, "ldconfig")) ld_so_conf = open(os.path.join(etcdir, "ld.so.conf"), "w") -- 1.7.12

1 0

[pacman-dev] [PATCH] makepkg: print "SKIP" for signature checksums
by Allan McRae 20 Sep '12

20 Sep '12

There are valid reasons for a source files PGP signature to be changed (expired key, expired signature, additional person signing...). Thus providing a checksum for signature files can potentially cause a PKGBUILD to require unnecessary updating. Avoid this issue by using "SKIP" for the signature checksum. Fixes FS#31590. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index fce7558..5e8ada3 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1049,10 +1049,14 @@ generate_checksums() { sum="SKIP" ;; *) - local file - file="$(get_filepath "$netfile")" || missing_source_file "$netfile" - sum="$(openssl dgst -${integ} "$file")" - sum=${sum##* } + if [[ ! $netfile = *.@(sig?(n)|asc) ]]; then + local file + file="$(get_filepath "$netfile")" || missing_source_file "$netfile" + sum="$(openssl dgst -${integ} "$file")" + sum=${sum##* } + else + sum="SKIP" + fi ;; esac -- 1.7.12

1 0

[pacman-dev] [PATCH] m4/po.m4: Remove use of deprecated macro
by Allan McRae 19 Sep '12

19 Sep '12

Switch from AM_PROG_MKDIR_P to AC_PROG_MKDIR_P to avoid automake warning. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- It is advised to switch to using '$(MKDIR_P)' instead of '$(mkdir_p)' in Makefile.* too. Our only use of this in the the "Makefile.in.in" files from gettext. As these produce no warnings or errors yet, I think it best to wait on gettext to update these files. m4/po.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m4/po.m4 b/m4/po.m4 index 47f36a4..8bc921d 100644 --- a/m4/po.m4 +++ b/m4/po.m4 @@ -24,7 +24,7 @@ AC_DEFUN([AM_PO_SUBDIRS], [ AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AC_PROG_INSTALL])dnl - AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake + AC_REQUIRE([AC_PROG_MKDIR_P])dnl defined by autoconf AC_REQUIRE([AM_NLS])dnl dnl Release version of the gettext macros. This is used to ensure that -- 1.7.12

1 0

[pacman-dev] [PATCH 1/2] Fix typo in acinclude.m4 fs_old_*flags
by Dan McGee 19 Sep '12

19 Sep '12

Introduced in commit d2669b47. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- m4/acinclude.m4 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/m4/acinclude.m4 b/m4/acinclude.m4 index f57a515..e601f0e 100644 --- a/m4/acinclude.m4 +++ b/m4/acinclude.m4 @@ -58,11 +58,11 @@ AC_DEFUN([GCC_FORTIFY_SOURCE_CC],[ } ], [ AC_MSG_RESULT(yes) - CFLAGS="$df_old_cflags" + CFLAGS="$fs_old_cflags" ], [ AC_MSG_RESULT(no) - CPPFLAGS="$df_old_cppflags" - CFLAGS="$df_old_cflags" + CPPFLAGS="$fs_old_cppflags" + CFLAGS="$fs_old_cflags" ]) fi ]) -- 1.7.12

2 2

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.3-402-g2abe1f1
by dan＠archlinux.org 18 Sep '12

18 Sep '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, master has been updated via 2abe1f16461133c0dc386f8ecb8b06865c22940b (commit) via 3b02f80dcb3159a7ab0c673d5eae971ad7504e7f (commit) via ea452d027731e007e58e84e93df72ca66b034f47 (commit) via 8b9cb8e03de275fb7b71b3fdc970856158b10ff2 (commit) via 306c274239728a6307c06038e51f70ed904ba84b (commit) via 7a4f76c2afd787429a4b0e5fd3b4558216f92bd4 (commit) via 2d347132ba0f92a37edad5159a36803915c1caf0 (commit) via 800799ea63a4e5b48b320fbb55267a4c522b8e9a (commit) via 03ea8ca6a996c02f62d067eb5793aa59fe60ba8f (commit) via c926c39b0481ec3db931fff1f86db0c49d78976b (commit) via 34b52c9a60e43d84a8ea3930a19f8cbfa5815931 (commit) via 8f5ee729747937f52c2cc199a7498629ab6c9a7d (commit) via 7262f4bed455eee1a9341aabb08110e6c8f6db28 (commit) via 85506809248c205f763df685fa5bda5c21c06eae (commit) via aa50df630c0ca572ff14e938b180ae46040f14a3 (commit) via 369c5aa7ddabb81c335bb5b0dbd425c42f892459 (commit) via c4ab50584fc70f9cbf94fdb1153e2eb08c4052df (commit) via f7558856b174ea8a7fab099a05c2e7c6397851a2 (commit) via 37de9df7c048dc20522ccacaebf7e898ff20b96e (commit) via 87f9377b327ad6b12e9f1bde5669ebd6e1deef3e (commit) via e32d1299675da86bb26b414e1dd9e9d4d3bd5d81 (commit) via ea35ce5d2e067b6bfa6d4f443c5f8591a1bc9958 (commit) via de7a5cf346c3ea8c26e43f4f17834af6fc38a13b (commit) via 03f2e2360ab2950675f9cde32ccc93d1753c6541 (commit) via 140c76d3288b41773411534638305dc8b5928951 (commit) via 9648887481c7ad56ef9f7eb2d2810eb6ec32b5be (commit) via bad00696f34bd37243d0db411c26319ef0f640d8 (commit) via 89319b5bfd6a592ce99cb07729f66bbc2cbfed5c (commit) via 19b8298ce88564e38683279664400572ce285f2e (commit) from 0fe562011c83229472a75dc43d34f780843e16de (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 2abe1f16461133c0dc386f8ecb8b06865c22940b Author: Allan McRae <allan(a)archlinux.org> Date: Sat Sep 15 12:32:49 2012 +1000 makepkg: fix incorrect bracket usage Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3b02f80dcb3159a7ab0c673d5eae971ad7504e7f Author: Gary van der Merwe <garyvdm(a)gmail.com> Date: Sat Sep 15 12:24:01 2012 +1000 makepkg: Add Bazaar VCS support Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ea452d027731e007e58e84e93df72ca66b034f47 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Sep 9 13:16:12 2012 +1000 makepkg: fix order of --help output Small alphabeticalization issue in options passable to pacman. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8b9cb8e03de275fb7b71b3fdc970856158b10ff2 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Aug 28 11:42:06 2012 +1000 makepkg: allow fragment to contain a "#" character The frament element of a vcs url may contain the "#" charcter in the (e.g) branch or tag name. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 306c274239728a6307c06038e51f70ed904ba84b Author: Allan McRae <allan(a)archlinux.org> Date: Tue Aug 28 11:35:20 2012 +1000 makepkg: always check makepkg.conf for match to download protocol The list of which download protocol should look in makepkg.conf for the download agent was hard coded into makepkg. Instead, fallback to checking the the download agents array for any non-local or (implemented) vcs source. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7a4f76c2afd787429a4b0e5fd3b4558216f92bd4 Author: Allan McRae <allan(a)archlinux.org> Date: Thu Aug 23 10:10:06 2012 +1000 makepkg: do not embed timestamps in compressed manpages This will make the checksum of man pages match across architectures despite different build times. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2d347132ba0f92a37edad5159a36803915c1caf0 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Aug 22 23:35:17 2012 +1000 makepkg: check if hg and svn directories are non-empty before updating Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 800799ea63a4e5b48b320fbb55267a4c522b8e9a Author: Allan McRae <allan(a)archlinux.org> Date: Wed Aug 22 23:30:34 2012 +1000 makepkg: do not create hg working directory on checkout Creating the working directory can waste a lot of space. Fixes FS#31221. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 03ea8ca6a996c02f62d067eb5793aa59fe60ba8f Author: Gary van der Merwe <garyvdm(a)gmail.com> Date: Thu Aug 16 11:30:34 2012 +0200 makepkg: Improvements to get_filename: * For any vcs other that git, the fall through resulted in being handled by the code for std url, hence fragments were being left on. * Handle vcs urls than end in a slash correctly, eg http://example.com/project/ Signed-off-by: Gary van der Merwe <garyvdm(a)gmail.com> commit c926c39b0481ec3db931fff1f86db0c49d78976b Author: Mohammad Alsaleh <msal(a)i2pmail.org> Date: Sun Aug 12 00:24:57 2012 +0000 makepkg: check if $dir is a local clone of the right git repo Before this patch, makepkg does not check if $dir is a local clone of the right repo. For example, git fetch would be run even if $dir is not a local bare clone of a git repo in present in source(), but a subdir of a checked-out one. That means makepkg can potentially fetch from a completely unrelated remote and update completely unrelated dirs/files. This patch adds a check to make sure we are fetching from the right remote. Signed-off-by: Mohammad Alsaleh <msal(a)i2pmail.org> commit 34b52c9a60e43d84a8ea3930a19f8cbfa5815931 Author: Mohammad Alsaleh <msal(a)i2pmail.org> Date: Sun Aug 12 00:24:43 2012 +0000 makepkg: git clone instead of git fetch if $dir exists but empty Before this patch, makepkg would only check if $dir exists as an indication that a local clone exists. And if $dir does exist, makepkg will run git fetch inside it unconditionally. After applying this patch, makepkg will check if the existent $dir is empty. And if it is, it will be used to store a local clone. Signed-off-by: Mohammad Alsaleh <msal(a)i2pmail.org> commit 8f5ee729747937f52c2cc199a7498629ab6c9a7d Author: Allan McRae <allan(a)archlinux.org> Date: Sat Aug 11 23:43:43 2012 +1000 Avoid interger overflow when calculating remaining line length When the len and cidx were changed to size_t in a8a1b093, it was possible to have an integer overflow when a line ended right at the edge of the terminal width. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7262f4bed455eee1a9341aabb08110e6c8f6db28 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Aug 11 20:21:44 2012 +1000 Fix typo in documentation Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 85506809248c205f763df685fa5bda5c21c06eae Author: Allan McRae <allan(a)archlinux.org> Date: Sat Aug 11 18:56:17 2012 +1000 makepkg: fix warnings with --noextract Three warnings after someone deliberately typed --noextract is a tad excessive... Also, an empty $srcdir is perfectly valid when the source array is empty, although using --noextact then is wasteful. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit aa50df630c0ca572ff14e938b180ae46040f14a3 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Aug 10 20:20:48 2012 -0400 makepkg: implement dir_is_empty for dir content checks Rather than calling upon ls for this, use a proper shell function which uses globbing to determine the existance of files in a directory. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 369c5aa7ddabb81c335bb5b0dbd425c42f892459 Merge: 37de9df c4ab505 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Sep 18 08:36:10 2012 -0500 Merge branch 'maint' commit 37de9df7c048dc20522ccacaebf7e898ff20b96e Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Aug 16 22:59:46 2012 -0400 pkgdelta: pass correct args to create_delta Somewhere in the arg parse refactoring, the args array went away and we simply stashed our remaining parameters as positionals. Fix this up so that pkgdelta doesn't mysteriously hang in read_pkginfo(). Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 87f9377b327ad6b12e9f1bde5669ebd6e1deef3e Author: Allan McRae <allan(a)archlinux.org> Date: Sun Aug 12 22:07:10 2012 +1000 Fix documentation typo Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e32d1299675da86bb26b414e1dd9e9d4d3bd5d81 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Aug 12 22:06:09 2012 +1000 Remove incorrect documentation for unlink_file Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ea35ce5d2e067b6bfa6d4f443c5f8591a1bc9958 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Aug 11 17:35:13 2012 -0400 query_fileowner, mdirname: add error checks Also consolidates cleanup for query_fileowner. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> commit de7a5cf346c3ea8c26e43f4f17834af6fc38a13b Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Aug 11 17:35:12 2012 -0400 query_fileowner: remove assumption that root is "/" Returning "/" from mdirname removes it as a special case which allows us to test it like any other directory. This corrects a false positive when querying a file in / and root is not set to /. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> commit 03f2e2360ab2950675f9cde32ccc93d1753c6541 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Thu Jul 26 01:04:20 2012 -0400 query_fileowner: remove trailing '/' from targets Trailing '/' in paths causes lstat to dereference symlinks to directories which causes it to break even though the symlink is a valid target. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> commit 140c76d3288b41773411534638305dc8b5928951 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Thu Jul 26 01:01:50 2012 -0400 query_fileowner: resolve root early Resolving root early prevents later calls to realpath from having to do the work of actually resolving any symlinks in root. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 9648887481c7ad56ef9f7eb2d2810eb6ec32b5be Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sun Jul 22 13:30:11 2012 -0400 query_fileowner: remove resolve_path function resolve_path is a equivalent to calling realpath(path, NULL) except that the returned string is guaranteed to be PATH_MAX long. We never append to the returned string, so this is unnecessary. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> commit bad00696f34bd37243d0db411c26319ef0f640d8 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Jul 7 15:12:49 2012 -0400 query_fileowner: break/continue pkgfile loop Break out of pkgfile loop on match or continue if the pkgfile path is too long. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> ----------------------------------------------------------------------- Summary of changes: doc/PKGBUILD.5.txt | 5 +- doc/makepkg.conf.5.txt | 4 ++ doc/pacman.8.txt | 3 - lib/libalpm/remove.c | 4 -- lib/libalpm/signing.c | 5 ++ lib/libalpm/trans.c | 2 +- scripts/makepkg.sh.in | 144 +++++++++++++++++++++++++++++++++++------------- scripts/pkgdelta.sh.in | 2 +- src/pacman/package.c | 2 +- src/pacman/query.c | 121 +++++++++++++++++++--------------------- src/pacman/util.c | 12 +++- test/pacman/pmtest.py | 5 +- 12 files changed, 193 insertions(+), 116 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v4.0.3-30-gc4ab505
by dan＠archlinux.org 18 Sep '12

18 Sep '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 c4ab50584fc70f9cbf94fdb1153e2eb08c4052df (commit) via f7558856b174ea8a7fab099a05c2e7c6397851a2 (commit) via 89319b5bfd6a592ce99cb07729f66bbc2cbfed5c (commit) via 19b8298ce88564e38683279664400572ce285f2e (commit) from c9b31ad6220e7706caf0bad55355957bfcd041cb (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 c4ab50584fc70f9cbf94fdb1153e2eb08c4052df Author: Allan McRae <allan(a)archlinux.org> Date: Wed Sep 5 17:50:30 2012 +1000 pacman.8: remove redundant section Signed-off-by: Allan McRae <allan(a)archlinux.org> commit f7558856b174ea8a7fab099a05c2e7c6397851a2 Author: Florian Pritz <bluewind(a)xinu.at> Date: Mon Jul 9 10:28:03 2012 +0200 signing.c: warn if time went backwards GPG signatures have a timestamp which is checked and if it's in the future, verification will fail. Dan: slight wording change. Signed-off-by: Florian Pritz <bluewind(a)xinu.at> commit 89319b5bfd6a592ce99cb07729f66bbc2cbfed5c Author: Allan McRae <allan(a)archlinux.org> Date: Mon Sep 17 16:07:24 2012 +1000 Document system and user specific makepkg.conf Add details of the system wide and user specific versions of makepkg.conf to the man page. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 19b8298ce88564e38683279664400572ce285f2e Author: Allan McRae <allan(a)archlinux.org> Date: Tue Sep 18 01:29:08 2012 +1000 pactest: allow running with valgrind from any directory When using the --valgrind flag with the pactest.py script, the path to the suppression file relies on the script being called from the source root directory. Construct the path from the scripts location to allow it to be called from directory. Dan: style cleanup. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/makepkg.conf.5.txt | 4 ++++ doc/pacman.8.txt | 3 --- lib/libalpm/signing.c | 5 +++++ test/pacman/pmtest.py | 5 ++++- 4 files changed, 13 insertions(+), 4 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Signed-off-by: Chirantan Ekbote <chirantan.ekbote@gmail.com>
by Chirantan Ekbote 18 Sep '12

18 Sep '12

Added code that lists if an optional dependency of a package is installed locally and additonally prints the version number of the installed dependency. Patch for FS#13035 in the pacman bug tracker. --- src/pacman/util.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 7f7f6a7..5c0d7f4 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -701,16 +701,31 @@ void list_display_linebreak(const char *title, const alpm_list_t *list, printf("%s\n", _("None")); } else { const alpm_list_t *i; + alpm_db_t *db_local = alpm_get_localdb(config->handle); + /* Print the first element */ - indentprint((const char *)list->data, len, maxcols); + char *pkgname = (char *)list->data; + alpm_pkg_t *lpkg = alpm_db_get_pkg(db_local, (const char *)pkgname); + indentprint((const char *)pkgname, len, maxcols); + + /* Print the version number if the package is installed locally */ + if(lpkg != NULL) { + printf(" [%s: %s]", _("installed"), alpm_pkg_get_version(lpkg)); + } printf("\n"); + /* Print the rest */ for(i = alpm_list_next(list); i; i = alpm_list_next(i)) { size_t j; for(j = 1; j <= len; j++) { printf(" "); } - indentprint((const char *)i->data, len, maxcols); + pkgname = (char *)i->data; + lpkg = alpm_db_get_pkg(db_local, (const char *)pkgname); + indentprint((const char *)pkgname, len, maxcols); + if(lpkg != NULL) { + printf(" [%s: %s]", _("installed"), alpm_pkg_get_version(lpkg)); + } printf("\n"); } } -- 1.7.12

2 3

[pacman-dev] [PATCH] Suppress repeated dependency resolving error messages
by Allan McRae 17 Sep '12

17 Sep '12

When hitting an unresolvable dependency, pacman will output a message like: warning: cannot resolve "glibc>=1.0-2", a dependency of "gcc-libs" This currently is repeated every time the package with the unresolvable dependency is seen during dependency resolution. Limit this to printing the output once. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/deps.c | 13 ++++++++----- lib/libalpm/deps.h | 2 +- lib/libalpm/sync.c | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 6841097..d218f0b 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -715,6 +715,7 @@ alpm_pkg_t SYMEXPORT *alpm_find_dbs_satisfier(alpm_handle_t *handle, * transaction * @param data returns the dependency which could not be satisfied in the * event of an error + * @param quiet suppress missing dependency warnings * @return 0 on success, with [pkg] and all of its dependencies not already on * the [*packages] list added to that list, or -1 on failure due to an * unresolvable dependency, in which case the [*packages] list will be @@ -722,7 +723,7 @@ alpm_pkg_t SYMEXPORT *alpm_find_dbs_satisfier(alpm_handle_t *handle, */ int _alpm_resolvedeps(alpm_handle_t *handle, alpm_list_t *localpkgs, alpm_pkg_t *pkg, alpm_list_t *preferred, alpm_list_t **packages, - alpm_list_t *rem, alpm_list_t **data) + alpm_list_t *rem, alpm_list_t **data, int quiet) { int ret = 0; alpm_list_t *j; @@ -763,7 +764,7 @@ int _alpm_resolvedeps(alpm_handle_t *handle, alpm_list_t *localpkgs, /* find a satisfier package in the given repositories */ spkg = resolvedep(handle, missdep, handle->dbs_sync, *packages, 0); } - if(spkg && _alpm_resolvedeps(handle, localpkgs, spkg, preferred, packages, rem, data) == 0) { + if(spkg && _alpm_resolvedeps(handle, localpkgs, spkg, preferred, packages, rem, data, 1) == 0) { _alpm_log(handle, ALPM_LOG_DEBUG, "pulling dependency %s (needed by %s)\n", spkg->name, pkg->name); @@ -773,9 +774,11 @@ int _alpm_resolvedeps(alpm_handle_t *handle, alpm_list_t *localpkgs, } else { handle->pm_errno = ALPM_ERR_UNSATISFIED_DEPS; char *missdepstring = alpm_dep_compute_string(missdep); - _alpm_log(handle, ALPM_LOG_WARNING, - _("cannot resolve \"%s\", a dependency of \"%s\"\n"), - missdepstring, pkg->name); + if(!quiet) { + _alpm_log(handle, ALPM_LOG_WARNING, + _("cannot resolve \"%s\", a dependency of \"%s\"\n"), + missdepstring, pkg->name); + } free(missdepstring); if(data) { *data = alpm_list_add(*data, miss); diff --git a/lib/libalpm/deps.h b/lib/libalpm/deps.h index c8e1bc3..7470ea1 100644 --- a/lib/libalpm/deps.h +++ b/lib/libalpm/deps.h @@ -34,7 +34,7 @@ alpm_list_t *_alpm_sortbydeps(alpm_handle_t *handle, alpm_list_t *targets, int r int _alpm_recursedeps(alpm_db_t *db, alpm_list_t *targs, int include_explicit); int _alpm_resolvedeps(alpm_handle_t *handle, alpm_list_t *localpkgs, alpm_pkg_t *pkg, alpm_list_t *preferred, alpm_list_t **packages, alpm_list_t *remove, - alpm_list_t **data); + alpm_list_t **data, int quiet); alpm_depend_t *_alpm_splitdep(const char *depstring); int _alpm_depcmp_literal(alpm_pkg_t *pkg, alpm_depend_t *dep); int _alpm_depcmp(alpm_pkg_t *pkg, alpm_depend_t *dep); diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index ca6b507..634d7cd 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -409,7 +409,7 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) for(i = trans->add; i; i = i->next) { alpm_pkg_t *pkg = i->data; if(_alpm_resolvedeps(handle, localpkgs, pkg, trans->add, - &resolved, remove, data) == -1) { + &resolved, remove, data, 0) == -1) { unresolvable = alpm_list_add(unresolvable, pkg); } /* Else, [resolved] now additionally contains [pkg] and all of its -- 1.7.12

1 1

[pacman-dev] [PATCH] pactest: allow running with valgrind from any directory
by Allan McRae 17 Sep '12

17 Sep '12

When using the --valgrind flag with the pactest.py script, the path to the suppression file relies on the script being called from the source root directory. Construct the path from the scripts location to allow it to be called from directory. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- test/pacman/pmtest.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/pacman/pmtest.py b/test/pacman/pmtest.py index 1a02686..625dccd 100644 --- a/test/pacman/pmtest.py +++ b/test/pacman/pmtest.py @@ -205,7 +205,8 @@ def run(self, pacman): if pacman["valgrind"]: cmd.extend(["libtool", "execute", "valgrind", "-q", "--tool=memcheck", "--leak-check=full", - "--show-reachable=yes", "--suppressions=%s/valgrind.supp" % os.getcwd()]) + "--show-reachable=yes", + "--suppressions=%s" % os.path.join(os.path.dirname( __file__ ), '..', '..', 'valgrind.supp') ]) cmd.extend([pacman["bin"], "--config", os.path.join(self.root, util.PACCONF), "--root", self.root, -- 1.7.12

1 0

[pacman-dev] [PATCH] makepkg: use last match in BUILDENV/OPTIONS array
by Allan McRae 17 Sep '12

17 Sep '12

Using the last match in the BUILDENV and OPTIONS arrays allows the user to easily override these values without specifying the entire array. For example add "BUILDENV+=(sign)" in ~/.makepkg.conf. Fixes FS#26701. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/makepkg.conf.5.txt | 6 ++++-- scripts/makepkg.sh.in | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index 3dbaea1..cf9da73 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -81,7 +81,8 @@ Options This array contains options that affect the build environment, the defaults are shown here. All options should always be left in the array; to enable or disable an option simply remove or place an ``!'' at the front of the - option. Each works as follows: + option. If an option is specified multiple times, the final value takes + precedence. Each option works as follows: *fakeroot*;; Allow building packages as a non-root user. This is highly recommended. @@ -134,7 +135,8 @@ Options equivalent to options that can be placed in the PKGBUILD; the defaults are shown here. All options should always be left in the array; to enable or disable an option simply remove or place an ``!'' at the front of the - option. Each works as follows: + option. If an option is specified multiple times, the final value takes + precedence. Each option works as follows: *strip*;; Strip symbols from binaries and libraries. If you frequently use a diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index d387b7d..fce7558 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -830,8 +830,9 @@ check_buildenv() { in_opt_array() { local needle=$1; shift - local opt - for opt in "$@"; do + local i opt + for (( i = $#; i > 0; i-- )); do + opt=${!i} if [[ $opt = "$needle" ]]; then # enabled return 0 -- 1.7.12

1 0