[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v4.0.0-6-g04fd320
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@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@archlinux.org> commit 241946cceaf4c90624794a17c6a13661ea9862a9 Author: Lukas Fleischer <archlinux@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@cryptocrack.de> Signed-off-by: Dan McGee <dan@archlinux.org> commit d4c97ea2f64cafd3e14e2817d2b805f0b0d541f1 Author: Lukas Fleischer <archlinux@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@cryptocrack.de> Signed-off-by: Dan McGee <dan@archlinux.org> commit 12642a299b9f4218f43ce8a4f1d9924cfae744ee Author: Dan McGee <dan@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@archlinux.org> commit 2a18171afa9ba8acf1123355f252b1189aefeeeb Author: Dan McGee <dan@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@archlinux.org> commit 61c6ae01b3315c5db38ef5d313ac6f0b75fe2209 Author: Dan McGee <dan@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@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
participants (1)
-
dan@archlinux.org