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

[pacman-dev] [PATCH] makepkg: don't attach traps until after argument parsing
by Dan McGee 14 Oct '11

14 Oct '11

Nothing we do in our traps is necessary this early in the script. This fixes FS#26196. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- scripts/makepkg.sh.in | 20 +++++++++----------- 1 files changed, 9 insertions(+), 11 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 09c1e96..3085bf5 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -174,17 +174,6 @@ clean_up() { } -## -# Signal Traps -## -set -E -trap 'clean_up' 0 -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 - enter_fakeroot() { msg "$(gettext "Entering %s environment...")" "fakeroot" @@ -1956,6 +1945,15 @@ while true; do shift done +# setup signal traps +trap 'clean_up' 0 +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}) [[ -n ${SRCDEST} ]] && _SRCDEST=$(canonicalize_path ${SRCDEST}) -- 1.7.7

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.0-17-g53e525c
by dan＠archlinux.org 14 Oct '11

14 Oct '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 53e525c4f3a6b0bfdc346b4563c6c8fc0e1b5b11 (commit) from ff8704635440fe890ac8621722cc8301a3875e48 (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 53e525c4f3a6b0bfdc346b4563c6c8fc0e1b5b11 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Oct 13 16:25:21 2011 -0500 Fix some strict 32-bit gcc warnings Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/util.c | 4 +++- src/pacman/callback.c | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/2] doc: update .gitignore, add CSS override for new tables usage
by Dan McGee 13 Oct '11

13 Oct '11

* Make all docs depend on Makefile; if we change flags here we want them rebuilt. * Add explicit filenames to .gitignore so we can add our own CSS override file, and add an asciidoc-override.css resource. * Adjust a few asciidoc options when generating HTML. * Remove asciidoc-manpage.css; apparantly this doesn't exist anymore. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- doc/.gitignore | 4 +++- doc/Makefile.am | 12 +++++++----- doc/asciidoc-override.css | 7 +++++++ 3 files changed, 17 insertions(+), 6 deletions(-) create mode 100644 doc/asciidoc-override.css diff --git a/doc/.gitignore b/doc/.gitignore index a7f33e5..5625735 100644 --- a/doc/.gitignore +++ b/doc/.gitignore @@ -9,7 +9,9 @@ pkgdelta.8 repo-add.8 repo-remove.8 vercmp.8 -*.css +asciidoc-manpage.css +asciidoc.css +asciidoc.js *.html *.xml man3 diff --git a/doc/Makefile.am b/doc/Makefile.am index aa27b50..f449e72 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -41,6 +41,7 @@ HTML_DOCS = \ EXTRA_DIST = \ asciidoc.conf \ + asciidoc-override.css \ pacman.8.txt \ makepkg.8.txt \ repo-add.8.txt \ @@ -91,8 +92,9 @@ html: $(HTML_DOCS) website: html bsdtar czf website.tar.gz $(HTML_DOCS) \ + asciidoc-override.css \ -C /etc/asciidoc/stylesheets/ \ - asciidoc.css asciidoc-manpage.css \ + asciidoc.css \ -C /etc/asciidoc/javascripts/ \ asciidoc.js \ -C /etc/asciidoc/ \ @@ -116,7 +118,7 @@ A2X_OPTS = \ --destination-dir='./' # These rules are due to the includes and files of the asciidoc text -$(ASCIIDOC_MANS): asciidoc.conf footer.txt +$(ASCIIDOC_MANS): asciidoc.conf footer.txt Makefile a2x $(A2X_OPTS) --asciidoc-opts="$(ASCIIDOC_OPTS) --out-file=./$@.xml" $(srcdir)/$@.txt %.html: %.txt @@ -128,9 +130,9 @@ HACKING.html: ../HACKING dos2unix $@ # Customizations for certain HTML docs -$(HTML_MANPAGES): asciidoc.conf footer.txt -$(HTML_OTHER): asciidoc.conf -%.html: ASCIIDOC_OPTS += -a linkcss -a toc -a icons +$(HTML_MANPAGES): asciidoc.conf footer.txt Makefile +$(HTML_OTHER): asciidoc.conf Makefile +%.html: ASCIIDOC_OPTS += -a linkcss -a toc -a icons -a max-width=960px -a stylesheet=asciidoc-override.css %.8.html: ASCIIDOC_OPTS += -d manpage %.5.html: ASCIIDOC_OPTS += -d manpage %.3.html: ASCIIDOC_OPTS += -d manpage diff --git a/doc/asciidoc-override.css b/doc/asciidoc-override.css new file mode 100644 index 0000000..328c8fc --- /dev/null +++ b/doc/asciidoc-override.css @@ -0,0 +1,7 @@ +table th, table td { + padding: 0.2em 1em; +} + +table td p.table { + margin: 0; +} -- 1.7.7

1 1

[pacman-dev] [PATCH] lib/util: call malloc from MALLOC, not calloc
by Dave Reisner 13 Oct '11

13 Oct '11

This was added in cc754bc6 as a "safety" measure, but sort of defeats the purpose of having this macro. If we're using malloc unsafely, then we've already lost. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- lib/libalpm/util.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index 2a2d3a9..86aa7f2 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -51,7 +51,7 @@ #define ALLOC_FAIL(s) do { fprintf(stderr, "alloc failure: could not allocate %zd bytes\n", s); } while(0) -#define MALLOC(p, s, action) do { p = calloc(1, s); if(p == NULL) { ALLOC_FAIL(s); action; } } while(0) +#define MALLOC(p, s, action) do { p = malloc(s); if(p == NULL) { ALLOC_FAIL(s); action; } } while(0) #define CALLOC(p, l, s, action) do { p = calloc(l, s); if(p == NULL) { ALLOC_FAIL(s); action; } } while(0) /* This strdup macro is NULL safe- copying NULL will yield NULL */ #define STRDUP(r, s, action) do { if(s != NULL) { r = strdup(s); if(r == NULL) { ALLOC_FAIL(strlen(s)); action; } } else { r = NULL; } } while(0) -- 1.7.7

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.0-16-gff87046
by dan＠archlinux.org 13 Oct '11

13 Oct '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 ff8704635440fe890ac8621722cc8301a3875e48 (commit) via 04fd320e97770911894fb06ba98f3c17fc30c7d9 (commit) via 35e6136f4b1b45a7cb736ca0608da7f44c74b233 (commit) via 241946cceaf4c90624794a17c6a13661ea9862a9 (commit) via d4c97ea2f64cafd3e14e2817d2b805f0b0d541f1 (commit) via 12642a299b9f4218f43ce8a4f1d9924cfae744ee (commit) via 6be492d2f71bf0968b836e17a0f59a0e32572b49 (commit) via 1b7d2b0cfaaf7e2d376fa2542ed2d0442f3a0764 (commit) via a27bdcfe51e0c6eac30d8fbc5dcc2a67a1c1b929 (commit) via 2a18171afa9ba8acf1123355f252b1189aefeeeb (commit) via 61c6ae01b3315c5db38ef5d313ac6f0b75fe2209 (commit) via 89fe19f3e102dae379c00e5b45dd1d42a6963962 (commit) via 980b3faea5ecfb54186bf74b2b6d79e0cb7836ea (commit) via 027a8a326073a257bc90a2e16e9b6e9301b36580 (commit) via 5f3629bea0d4beb79c6092086b46f3d73643c76d (commit) via 759f435fb91a3abf64a422b53f939a774332cd8a (commit) from d3d3b861ac2c4ce63c306e00395945bfa3c1b6c6 (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 ff8704635440fe890ac8621722cc8301a3875e48 Merge: 35e6136 04fd320 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Oct 13 11:25:09 2011 -0500 Merge branch 'maint' Conflicts: src/pacman/util.c commit 35e6136f4b1b45a7cb736ca0608da7f44c74b233 Author: Lukas Fleischer <archlinux(a)cryptocrack.de> Date: Thu Oct 13 17:23:21 2011 +0200 scripts/*.sh.in: Honor TMPDIR environment variable Replace "/tmp" with "${TMPDIR:-/tmp}" to allow for overriding the hardcoded path. Since we only use "/tmp" in conjunction with mktemp(1), we could also have used "--tmpdir", which is GNU-ish, however (and the BSD counterpart "-t" has been deprecated in GNU mktemp). Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6be492d2f71bf0968b836e17a0f59a0e32572b49 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Oct 6 00:55:47 2011 -0500 Remove alpm_list_getdata wrapper function This one is pretty darn useless. Just derefence the ->data attribute since the type is public anyway and save yourself the function call. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1b7d2b0cfaaf7e2d376fa2542ed2d0442f3a0764 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Sep 20 17:34:36 2011 -0500 diskspace: extract check_mountpoint() function This will be useful when extending disk space checks to free space checking before we download package files. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a27bdcfe51e0c6eac30d8fbc5dcc2a67a1c1b929 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Sep 27 17:37:27 2011 -0500 _alpm_archive_fgets: optimize EOL search Instead of iterating character by character, use memchr() calls to hopefully speed up the search. A newline is the most likely culprit, so search for that first followed by a NULL byte if there was no newline in the buffer. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 89fe19f3e102dae379c00e5b45dd1d42a6963962 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Sep 30 11:46:44 2011 -0500 Convert MALLOC to actually call malloc() If you need zero-filled allocations, call CALLOC() instead. This was from the original definition of these macros in commit cc754bc6e3be0f3; hopefully our code is in the shape it needs to be to switch this behavior. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 980b3faea5ecfb54186bf74b2b6d79e0cb7836ea Author: Dan McGee <dan(a)archlinux.org> Date: Fri Sep 30 11:43:11 2011 -0500 Move infrequently used path variables off the stack These backup-related paths in package extraction are used on relatively few files during the install process, so bump them off the stack and into the heap. This removes the artificial PATH_MAX limitation on their length as well. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 027a8a326073a257bc90a2e16e9b6e9301b36580 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Sep 30 11:38:36 2011 -0500 Extract a try_rename helper from extract_single_file() This moves the repetitive (and highly unlikely) logging work to a single location. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5f3629bea0d4beb79c6092086b46f3d73643c76d Author: Dan McGee <dan(a)archlinux.org> Date: Wed Sep 7 10:21:47 2011 -0500 Introduce alpm_time_t type This will always be a 64-bit signed integer rather than the variable length time_t type. Dates beyond 2038 should be fully supported in the library; the frontend still lags behind because 32-bit platforms provide no localtime64() or equivalent function to convert from an epoch value to a broken down time structure. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 759f435fb91a3abf64a422b53f939a774332cd8a Author: Dan McGee <dan(a)archlinux.org> Date: Wed Sep 7 09:32:23 2011 -0500 _alpm_parsedate: use strtoll() to parse numeric value This prepares the function to handle values past year 2038. The return type is still limited to 32-bits on 32-bit systems; this will be adjusted in a future patch. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: NEWS | 4 ++ lib/libalpm/add.c | 92 ++++++++++++++++--------------- lib/libalpm/alpm.h | 16 +++--- lib/libalpm/alpm_list.c | 13 ----- lib/libalpm/alpm_list.h | 1 - lib/libalpm/be_local.c | 9 ++-- lib/libalpm/db.h | 2 - lib/libalpm/diskspace.c | 40 ++++++++------ lib/libalpm/dload.h | 2 - lib/libalpm/package.c | 10 ++-- lib/libalpm/package.h | 9 ++-- lib/libalpm/signing.c | 49 ++++++++++------- lib/libalpm/sync.c | 4 +- lib/libalpm/util.c | 59 +++++++++++++------- lib/libalpm/util.h | 5 +- scripts/makepkg.sh.in | 4 +- scripts/pacman-optimize.sh.in | 2 +- scripts/repo-add.sh.in | 18 +++++-- src/pacman/callback.c | 1 + src/pacman/conf.c | 2 +- src/pacman/deptest.c | 4 +- src/pacman/package.c | 9 ++-- src/pacman/pacman.c | 4 +- src/pacman/query.c | 26 +++++----- src/pacman/remove.c | 10 ++-- src/pacman/sync.c | 66 +++++++++++----------- src/pacman/upgrade.c | 2 +- src/pacman/util.c | 121 +++++++++++++++++++++-------------------- src/util/cleanupdelta.c | 6 +- src/util/pactree.c | 6 +- src/util/testdb.c | 6 +- 31 files changed, 322 insertions(+), 280 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v4.0.0-6-g04fd320
by dan＠archlinux.org 13 Oct '11

13 Oct '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, maint has been updated via 04fd320e97770911894fb06ba98f3c17fc30c7d9 (commit) via 241946cceaf4c90624794a17c6a13661ea9862a9 (commit) via d4c97ea2f64cafd3e14e2817d2b805f0b0d541f1 (commit) via 12642a299b9f4218f43ce8a4f1d9924cfae744ee (commit) via 2a18171afa9ba8acf1123355f252b1189aefeeeb (commit) via 61c6ae01b3315c5db38ef5d313ac6f0b75fe2209 (commit) from d3d3b861ac2c4ce63c306e00395945bfa3c1b6c6 (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 04fd320e97770911894fb06ba98f3c17fc30c7d9 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Oct 13 11:22:50 2011 -0500 Update NEWS for missing 4.0 stuff and 4.0.1 changes so far Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 241946cceaf4c90624794a17c6a13661ea9862a9 Author: Lukas Fleischer <archlinux(a)cryptocrack.de> Date: Thu Oct 13 17:23:20 2011 +0200 scripts/*.sh.in: Fix signal handler error messages This includes some fixes to the messages that are displayed when a signal is caught in makepkg or repo-add: * Instead of always showing "==> ERROR: TERM signal caught. Exiting...", replace "TERM" by whatever signal is actually caught. * Fix a typo in the SIGERR error message in repo-add ("occurred" instead of "occured"). Francois already fixed this for makepkg in 1e51b81c. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d4c97ea2f64cafd3e14e2817d2b805f0b0d541f1 Author: Lukas Fleischer <archlinux(a)cryptocrack.de> Date: Thu Oct 13 17:23:19 2011 +0200 repo-add: Avoid race condition in signal handlers There is a small chance that a user sends SIGINT (or any other signal that is trapped) when we're already in clean_up() which used to lead to trap_exit() being executed and the remaining code in clean_up() being skipped due to the bash signal/trap handler blocking EXIT (since its handler is already being executed, even if it's interrupted). In practice, this behaviour caused unexpected results (primarily because pressing ^C at the wrong time left a lock file behind): $ ./repo-add extra.db.tar.gz foobar ==> Extracting database to a temporary location... ^C ==> ERROR: Aborted by user! Exiting... $ ./repo-add extra.db.tar.gz foobar ==> Extracting database to a temporary location... ==> ERROR: File 'foobar' not found. ==> No packages modified, nothing to do. ^C ==> ERROR: Aborted by user! Exiting... $ ./repo-add extra.db.tar.gz foobar ==> ERROR: Failed to acquire lockfile: extra.db.tar.gz.lck. ==> ERROR: Held by process 18522 Fix this and reduce the chance of race conditions in signal handlers by: * Unhooking all traps in both clean_up() and trap_exit(). * Call clean_up() explicitly in trap_exit() to make sure we remove the lock file and the temporary directory even if we send SIGINT when clean_up() is already being executed but didn't reach the unhook code yet. Also, add an optional parameter to clean_up() to allow for setting an explicit exit code when we call clean_up() from trap_exit(). Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 12642a299b9f4218f43ce8a4f1d9924cfae744ee Author: Dan McGee <dan(a)archlinux.org> Date: Wed Oct 12 17:32:54 2011 -0500 Add user-visible warning message if public keyring not found This should help point users in the right direction if they have not initialized via pacman-key just yet. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 2a18171afa9ba8acf1123355f252b1189aefeeeb Author: Dan McGee <dan(a)archlinux.org> Date: Mon Oct 3 10:52:16 2011 -0500 signing: delay gpgme_init() until latest possible moment In the default configuration, we can enter the signing code but still have nothing to do with GPGME- for example, if database signatures are optional but none are present. Delay initialization of GPGME until we know there is a signature file present or we were passed base64-encoded data. This also makes debugging with valgrind a lot easier as you don't have to deal with all the GPGME error noise because their code leaks like a sieve. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 61c6ae01b3315c5db38ef5d313ac6f0b75fe2209 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Oct 10 21:26:17 2011 -0500 VerbosePkgLists: format table lines in i18n-compatible way This had the unfortunate implementation detail that depended on the strings having 1 byte == 1 column hold true. As we know, this is not at all the case once you move past the base ASCII character set. Reimplement this whole thing so it doesn't depend on format strings at all. Instead, simply calculate the max column widths, and then when displaying each row add the correct amount of padding using UTF-8 safe string length functions. Before: 名字旧版本新版本净变化下载大小 libgee 0.6.2.1-1 0.60 MiB 0.10 MiB libsocialweb 0.25.19-2 1.92 MiB 0.23 MiB folks 0.6.3.2-1 1.38 MiB 0.25 MiB After: 名字旧版本新版本净变化下载大小 libgee 0.6.2.1-1 0.60 MiB 0.10 MiB libsocialweb 0.25.19-2 1.92 MiB 0.23 MiB folks 0.6.3.2-1 1.38 MiB 0.25 MiB Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: NEWS | 4 ++ lib/libalpm/signing.c | 49 ++++++++++++++++---------- scripts/makepkg.sh.in | 4 ++- scripts/repo-add.sh.in | 16 ++++++-- src/pacman/util.c | 89 +++++++++++++++++++++++++---------------------- 5 files changed, 96 insertions(+), 66 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/3] repo-add: Avoid race condition in signal handlers
by Lukas Fleischer 13 Oct '11

13 Oct '11

There is a small chance that a user sends SIGINT (or any other signal that is trapped) when we're already in clean_up() which used to lead to trap_exit() being executed and the remaining code in clean_up() being skipped due to the bash signal/trap handler blocking EXIT (since its handler is already being executed, even if it's interrupted). In practice, this behaviour caused unexpected results (primarily because pressing ^C at the wrong time left a lock file behind): $ ./repo-add extra.db.tar.gz foobar ==> Extracting database to a temporary location... ^C ==> ERROR: Aborted by user! Exiting... $ ./repo-add extra.db.tar.gz foobar ==> Extracting database to a temporary location... ==> ERROR: File 'foobar' not found. ==> No packages modified, nothing to do. ^C ==> ERROR: Aborted by user! Exiting... $ ./repo-add extra.db.tar.gz foobar ==> ERROR: Failed to acquire lockfile: extra.db.tar.gz.lck. ==> ERROR: Held by process 18522 Fix this and reduce the chance of race conditions in signal handlers by: * Unhooking all traps in both clean_up() and trap_exit(). * Call clean_up() explicitly in trap_exit() to make sure we remove the lock file and the temporary directory even if we send SIGINT when clean_up() is already being executed but didn't reach the unhook code yet. Also, add an optional parameter to clean_up() to allow for setting an explicit exit code when we call clean_up() from trap_exit(). Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- scripts/repo-add.sh.in | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 29b150c..d147b87 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -520,13 +520,19 @@ remove() { } trap_exit() { + # unhook all traps to avoid race conditions + trap '' EXIT TERM HUP QUIT INT ERR + echo error "$@" - exit 1 + clean_up 1 } clean_up() { - local exit_code=$? + local exit_code=${1:-$?} + + # unhook all traps to avoid race conditions + trap '' EXIT TERM HUP QUIT INT ERR [[ -d $tmpdir ]] && rm -rf "$tmpdir" (( CLEAN_LOCK )) && [[ -f $LOCKFILE ]] && rm -f "$LOCKFILE" -- 1.7.7

1 2

[pacman-dev] [PATCH] repo-add: Remove lock on SIG{TERM, HUP, QUIT, INT, ERR}
by Lukas Fleischer 13 Oct '11

13 Oct '11

There's no need to keep the lock file if we interrupt repo-{add,remove} using ^C (same applies to other signals). In contrast to a clean exit, we do not `rm -rf` the temporary directory here, so that it's still possible to analyze what went wrong. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- Hrm. Second time I had to manually remove "/srv/ftp/community/os/$arch/community.db.tar.gz.lck" on sigurd in order not to lock the whole database after interrupting `/arch/db-update`. I hope I didn't miss anything here but this should hopefully not cause any other unforeseen issues... scripts/repo-add.sh.in | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 29b150c..753200b 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -522,6 +522,9 @@ remove() { trap_exit() { echo error "$@" + + (( CLEAN_LOCK )) && [[ -f $LOCKFILE ]] && rm -f "$LOCKFILE" + exit 1 } -- 1.7.7

2 9

[pacman-dev] [PATCH] Add user-visible warning message if public keyring not found
by Dan McGee 13 Oct '11

13 Oct '11

This should help point users in the right direction if they have not initialized via pacman-key just yet. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/signing.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index 4042efb..ce5566b 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -140,6 +140,9 @@ static int init_gpgme(alpm_handle_t *handle) || _alpm_access(handle, sigdir, "trustdb.gpg", R_OK)) { handle->pm_errno = ALPM_ERR_NOT_A_FILE; _alpm_log(handle, ALPM_LOG_DEBUG, "Signature verification will fail!\n"); + _alpm_log(handle, ALPM_LOG_WARNING, + _("Public keyring not found; have you ran '%s'?\n"), + "pacman-key --init"); } /* calling gpgme_check_version() returns the current version and runs -- 1.7.7

2 1

[pacman-dev] [PATCH] Remove -f short option for --force
by Dan McGee 13 Oct '11

13 Oct '11

This is not something that should be used on a frequent basis, and giving it a short option encourages use without making the drawbacks obvious. For the 1% of situations that require it, the 5 extra keystrokes are a fair price to pay. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- Dave, Ionuț, and I are getting a bit fed up with people abusing this option and not realizing it skips a lot more than they think- if files move between packages, using this option will likely leave your system in a state you did not expect. Removing the short option for it at least makes people read the word "force" and maybe they will have some sense to step back and think about what they are doing first. If we do decide to do this, I will update the *completion files which I just realized I did not do. I can also add in the pactests showing the difference between an -Su and -Suf operation when files change between packages. doc/pacman.8.txt | 2 +- src/pacman/conf.h | 3 ++- src/pacman/pacman.c | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 5985381..39551e1 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -201,7 +201,7 @@ Transaction Options (apply to '-S', '-R' and '-U') Upgrade Options (apply to '-S' and '-U')[[UO]] -------------------------------------------- -*-f, \--force*:: +*\--force*:: Bypass file conflict checks and overwrite conflicting files. If the package that is about to be installed contains files that are already installed, this option will cause all those files to be overwritten. diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 9e14925..325fbb6 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -128,7 +128,8 @@ enum { OP_PRINTFORMAT, OP_GPGDIR, OP_RECURSIVE, - OP_DBONLY + OP_DBONLY, + OP_FORCE }; /* clean method */ diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index d14b887..0326ef1 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -180,7 +180,7 @@ static void usage(int op, const char * const myname) switch(op) { case PM_OP_SYNC: case PM_OP_UPGRADE: - addlist(_(" -f, --force force install, overwrite conflicting files\n")); + addlist(_(" --force force install, overwrite conflicting files\n")); addlist(_(" --asdeps install packages as non-explicitly installed\n")); addlist(_(" --asexplicit install packages as explicitly installed\n")); addlist(_(" --ignore <pkg> ignore a package upgrade (can be used more than once)\n")); @@ -533,7 +533,7 @@ static int parsearg_upgrade(int opt) if(parsearg_trans(opt) == 0) return 0; switch(opt) { - case 'f': config->flags |= ALPM_TRANS_FLAG_FORCE; break; + case OP_FORCE: config->flags |= ALPM_TRANS_FLAG_FORCE; break; case OP_ASDEPS: config->flags |= ALPM_TRANS_FLAG_ALLDEPS; break; case OP_ASEXPLICIT: config->flags |= ALPM_TRANS_FLAG_ALLEXPLICIT; break; case OP_NEEDED: config->flags |= ALPM_TRANS_FLAG_NEEDED; break; @@ -599,7 +599,6 @@ static int parseargs(int argc, char *argv[]) {"nodeps", no_argument, 0, 'd'}, {"deps", no_argument, 0, 'd'}, {"explicit", no_argument, 0, 'e'}, - {"force", no_argument, 0, 'f'}, {"groups", no_argument, 0, 'g'}, {"help", no_argument, 0, 'h'}, {"info", no_argument, 0, 'i'}, @@ -625,6 +624,7 @@ static int parseargs(int argc, char *argv[]) {"config", required_argument, 0, OP_CONFIG}, {"ignore", required_argument, 0, OP_IGNORE}, {"debug", optional_argument, 0, OP_DEBUG}, + {"force", no_argument, 0, OP_FORCE}, {"noprogressbar", no_argument, 0, OP_NOPROGRESSBAR}, {"noscriptlet", no_argument, 0, OP_NOSCRIPTLET}, {"ask", required_argument, 0, OP_ASK}, -- 1.7.7

2 1