[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.3-548-g9a40927
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 9a409275330bfe6c4865ab3c5ecc384a26d85e45 (commit) via 09f950af073ca82b03ef50dd6402fd72491a4770 (commit) via 8fa330335f9eb465724ed778464502f844e930ae (commit) via ef4757afa5d31ff6a6c09e3410c889f152826f4f (commit) via d9f9b87d3ff6621577aa15bf3304f73219f6d5f1 (commit) via 1d37c19e0492ddd426c7a05c815a45b997b55498 (commit) via 5136df0f393567117b84d4580737e2920cc63f57 (commit) via b283a1e06576821de6b3811a76b43ad081870dab (commit) via 0b57da2a43128dfaf475038eef938cae9cc24de1 (commit) via fab66f157d1b622cb120e21373a4893ad693ff33 (commit) via 1a919a11b85cb882bf5e632036a9030e4a98aba0 (commit) via 67445334e71eaf6138561eee8e5561733a59fc69 (commit) via 1e16b94a85678bc6d055e19f0efbd5bb680c5032 (commit) via 07a1292721c62f44d89a9fe6a0b093b5e6865b8a (commit) via 4c37d74ae50fc7c0f067aca07164fe75516d055b (commit) via 88644e181db49f3f94e6891166823fd5f46acbcc (commit) via 005eab0a080925d0d6f780d751f9019dafbafc64 (commit) from f10aea73e462f05d31de7b55667f58300fb89fa2 (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 9a409275330bfe6c4865ab3c5ecc384a26d85e45 Author: Dan McGee <dan@archlinux.org> Date: Mon Aug 8 17:17:15 2011 -0500 Update all translation files This moves us toward staring translations for the 4.0.0 release, although this should not be interpreted as a string freeze by any means. Signed-off-by: Dan McGee <dan@archlinux.org> commit 09f950af073ca82b03ef50dd6402fd72491a4770 Author: Dan McGee <dan@archlinux.org> Date: Mon Aug 8 17:11:14 2011 -0500 _alpm_access(): don't call gettext() in debug level loggers This is standard procedure elsewhere and cuts down on translations that won't be seen (and we don't want if we need English debug output anyway). Signed-off-by: Dan McGee <dan@archlinux.org> commit 8fa330335f9eb465724ed778464502f844e930ae Merge: ef4757a 6744533 Author: Dan McGee <dan@archlinux.org> Date: Mon Aug 8 17:05:25 2011 -0500 Merge branch 'maint' Conflicts: lib/libalpm/dload.c lib/libalpm/po/fi.po lib/libalpm/po/libalpm.pot po/de.po po/fi.po src/pacman/po/pacman.pot src/pacman/util.c commit ef4757afa5d31ff6a6c09e3410c889f152826f4f Author: Dan McGee <dan@archlinux.org> Date: Fri Jul 29 17:03:07 2011 -0500 Store a package info level flag if we fail to load data If we are missing a local database file, we get repeated messages over and over telling us the same thing, rather than being sane and erroring only once. This package adds an INFRQ_ERROR level that is added to the mask if we encounter any errors on a local_db_read() operation, and short circuits future calls if found in the value. This fixes FS#25313. Note that this does not make any behavior changes other than suppressing error messages and repeated code calls to failure cases; we still have more to do in the "local database is hosed" department. Also make a small update to the wrong but unused flags set in be_package; using INFRQ_ALL there was not totally correct. Signed-off-by: Dan McGee <dan@archlinux.org> commit d9f9b87d3ff6621577aa15bf3304f73219f6d5f1 Author: Dan McGee <dan@archlinux.org> Date: Mon Aug 8 15:24:04 2011 -0500 Add a test harness for new pacsort command Note that this is meant to exercise pacsort more than the underlying version comparsion; that is better left to the standalone vercmptest.sh test script. Signed-off-by: Dan McGee <dan@archlinux.org> commit 1d37c19e0492ddd426c7a05c815a45b997b55498 Author: Dave Reisner <dreisner@archlinux.org> Date: Mon Aug 8 14:37:30 2011 -0400 mark option structs as const These are never modified and even getopt_long's prototype shows this modifier on the parameter. Signed-off-by: Dave Reisner <dreisner@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org> commit 5136df0f393567117b84d4580737e2920cc63f57 Author: Dave Reisner <dreisner@archlinux.org> Date: Sun Aug 7 19:46:41 2011 -0400 paccache: use pacsort instead of sort -V Signed-off-by: Dave Reisner <dreisner@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org> commit b283a1e06576821de6b3811a76b43ad081870dab Author: Dave Reisner <dreisner@archlinux.org> Date: Sun Aug 7 15:32:06 2011 -0400 src/util/Makefile.am: alphabetize targets Signed-off-by: Dave Reisner <dreisner@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org> commit 0b57da2a43128dfaf475038eef938cae9cc24de1 Author: Dave Reisner <dreisner@archlinux.org> Date: Fri Aug 5 21:20:20 2011 -0400 pacsort: add new utility pacsort is a command line sorting utility that implements libalpm's alpm_pkg_vercmp algorithm. Signed-off-by: Dave Reisner <dreisner@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org> commit fab66f157d1b622cb120e21373a4893ad693ff33 Author: Dan McGee <dan@archlinux.org> Date: Mon Aug 8 14:27:31 2011 -0500 Bash-ify test/util/vercmptest.sh Signed-off-by: Dan McGee <dan@archlinux.org> commit 1a919a11b85cb882bf5e632036a9030e4a98aba0 Author: Dave Reisner <dreisner@archlinux.org> Date: Mon Aug 8 17:20:53 2011 -0400 makepkg: ignore epoch when undeclared In this case, we skip the epoch versioning entirely, as if it were declared as 0. Prevents errors such as: /usr/bin/makepkg: line 244: ((: ! : syntax error: operand expected (error token is " ") ==> Finished making: cower-git :20110808-1 (Mon Aug 8 17:17:27 EDT 2011) Signed-off-by: Dave Reisner <dreisner@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org> commit 1e16b94a85678bc6d055e19f0efbd5bb680c5032 Author: Dave Reisner <dreisner@archlinux.org> Date: Tue Aug 2 09:02:57 2011 -0400 contrib/paccache: misc cleanup and bugfix * change error verbiage when run as root * delete sigs along with packages * fix bug in diskspace calculations * merge END block in pkgfilter Signed-off-by: Dave Reisner <dreisner@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org> commit 07a1292721c62f44d89a9fe6a0b093b5e6865b8a Author: Dan McGee <dan@archlinux.org> Date: Mon Aug 8 12:24:43 2011 -0500 Check return value of rename() calls We did a good job checking this in add.c, but not necessarily anywhere else. Fix this up by adding checks into dload.c, remove.c, and conf.c in the frontend. Also add loggers where appropriate and make the message syntax more consistent. Signed-off-by: Dan McGee <dan@archlinux.org> ----------------------------------------------------------------------- Summary of changes: Makefile.am | 2 + contrib/paccache.in | 39 +++-- doc/PKGBUILD.5.txt | 3 +- lib/libalpm/be_local.c | 14 +- lib/libalpm/be_package.c | 4 +- lib/libalpm/db.h | 3 +- lib/libalpm/dload.c | 7 +- lib/libalpm/po/ca.po | 49 +++-- lib/libalpm/po/cs.po | 49 +++-- lib/libalpm/po/da.po | 46 +++-- lib/libalpm/po/de.po | 49 +++-- lib/libalpm/po/el.po | 49 +++-- lib/libalpm/po/en_GB.po | 49 +++-- lib/libalpm/po/es.po | 49 +++-- lib/libalpm/po/fi.po | 64 ++++-- lib/libalpm/po/fr.po | 49 +++-- lib/libalpm/po/hu.po | 49 +++-- lib/libalpm/po/it.po | 49 +++-- lib/libalpm/po/kk.po | 49 +++-- lib/libalpm/po/libalpm.pot | 44 +++-- lib/libalpm/po/nb.po | 49 +++-- lib/libalpm/po/pl.po | 49 +++-- lib/libalpm/po/pt.po | 49 +++-- lib/libalpm/po/pt_BR.po | 49 +++-- lib/libalpm/po/ro.po | 49 +++-- lib/libalpm/po/ru.po | 49 +++-- lib/libalpm/po/sk.po | 49 +++-- lib/libalpm/po/sr.po | 49 +++-- lib/libalpm/po/sr@latin.po | 49 +++-- lib/libalpm/po/sv.po | 46 +++-- lib/libalpm/po/tr.po | 49 +++-- lib/libalpm/po/uk.po | 46 +++-- lib/libalpm/po/zh_CN.po | 49 +++-- lib/libalpm/remove.c | 24 ++- lib/libalpm/util.c | 12 +- scripts/makepkg.sh.in | 2 +- scripts/po/ca.po | 449 ++++++++++++++++++++++++++++------------ scripts/po/cs.po | 442 +++++++++++++++++++++++++++------------ scripts/po/da.po | 446 +++++++++++++++++++++++++++------------- scripts/po/de.po | 459 ++++++++++++++++++++++++++++------------- scripts/po/el.po | 449 +++++++++++++++++++++++++++------------- scripts/po/en_GB.po | 441 +++++++++++++++++++++++++++------------ scripts/po/es.po | 453 ++++++++++++++++++++++++++++------------ scripts/po/fi.po | 454 ++++++++++++++++++++++++++++------------- scripts/po/fr.po | 457 ++++++++++++++++++++++++++++------------ scripts/po/hu.po | 459 ++++++++++++++++++++++++++++------------- scripts/po/it.po | 454 ++++++++++++++++++++++++++++------------- scripts/po/kk.po | 438 +++++++++++++++++++++++++++------------ scripts/po/nb.po | 448 +++++++++++++++++++++++++++------------- scripts/po/pacman-scripts.pot | 294 ++++++++++++++++----------- scripts/po/pl.po | 442 +++++++++++++++++++++++++++------------ scripts/po/pt.po | 459 ++++++++++++++++++++++++++++------------- scripts/po/pt_BR.po | 456 ++++++++++++++++++++++++++++------------- scripts/po/ro.po | 451 ++++++++++++++++++++++++++++------------- scripts/po/ru.po | 448 ++++++++++++++++++++++++++++------------ scripts/po/sk.po | 445 +++++++++++++++++++++++++++------------ scripts/po/sr.po | 445 +++++++++++++++++++++++++++------------- scripts/po/sr@latin.po | 445 +++++++++++++++++++++++++++------------- scripts/po/sv.po | 445 +++++++++++++++++++++++++++------------- scripts/po/tr.po | 445 +++++++++++++++++++++++++++------------ scripts/po/uk.po | 446 +++++++++++++++++++++++++++------------ scripts/po/zh_CN.po | 441 +++++++++++++++++++++++++++------------ src/pacman/conf.c | 8 +- src/pacman/pacman.c | 2 +- src/pacman/po/ca.po | 116 ++++++++--- src/pacman/po/cs.po | 115 ++++++++--- src/pacman/po/da.po | 114 ++++++++--- src/pacman/po/de.po | 117 ++++++++--- src/pacman/po/el.po | 112 ++++++++--- src/pacman/po/en_GB.po | 112 ++++++++--- src/pacman/po/es.po | 116 ++++++++--- src/pacman/po/fi.po | 114 ++++++++--- src/pacman/po/fr.po | 120 ++++++++--- src/pacman/po/hu.po | 115 ++++++++--- src/pacman/po/it.po | 116 ++++++++--- src/pacman/po/kk.po | 116 ++++++++--- src/pacman/po/nb.po | 112 ++++++++--- src/pacman/po/pacman.pot | 98 +++++++-- src/pacman/po/pl.po | 113 ++++++++--- src/pacman/po/pt.po | 114 ++++++++--- src/pacman/po/pt_BR.po | 117 ++++++++--- src/pacman/po/ro.po | 117 ++++++++--- src/pacman/po/ru.po | 116 ++++++++--- src/pacman/po/sk.po | 112 ++++++++--- src/pacman/po/sr.po | 112 ++++++++--- src/pacman/po/sr@latin.po | 112 ++++++++--- src/pacman/po/sv.po | 114 ++++++++--- src/pacman/po/tr.po | 114 ++++++++--- src/pacman/po/uk.po | 114 ++++++++--- src/pacman/po/zh_CN.po | 112 ++++++++--- src/pacman/sync.c | 11 +- src/pacman/util.c | 38 +++- src/util/.gitignore | 2 + src/util/Makefile.am | 22 +- src/util/pacsort.c | 394 +++++++++++++++++++++++++++++++++++ src/util/pactree.c | 2 +- test/util/Makefile.am | 1 + test/util/pacsorttest.sh | 103 +++++++++ test/util/vercmptest.sh | 18 +- 99 files changed, 11690 insertions(+), 4767 deletions(-) create mode 100644 src/util/pacsort.c create mode 100755 test/util/pacsorttest.sh hooks/post-receive -- The official pacman repository
On 09/08/11 08:18, Dan McGee wrote:
commit 1a919a11b85cb882bf5e632036a9030e4a98aba0 Author: Dave Reisner<dreisner@archlinux.org> Date: Mon Aug 8 17:20:53 2011 -0400
makepkg: ignore epoch when undeclared
In this case, we skip the epoch versioning entirely, as if it were declared as 0.
Prevents errors such as:
/usr/bin/makepkg: line 244: ((: ! : syntax error: operand expected (error token is " ") ==> Finished making: cower-git :20110808-1 (Mon Aug 8 17:17:27 EDT 2011)
Signed-off-by: Dave Reisner<dreisner@archlinux.org> Signed-off-by: Dan McGee<dan@archlinux.org>
How do you ever get that? # set defaults if they weren't specified in buildfile pkgbase=${pkgbase:-${pkgname[0]}} epoch=${epoch:-0} So epoch should always be set... perhaps the real bug should be fixed. Allan
On Tue, Aug 09, 2011 at 08:35:35AM +1000, Allan McRae wrote:
On 09/08/11 08:18, Dan McGee wrote:
commit 1a919a11b85cb882bf5e632036a9030e4a98aba0 Author: Dave Reisner<dreisner@archlinux.org> Date: Mon Aug 8 17:20:53 2011 -0400
makepkg: ignore epoch when undeclared
In this case, we skip the epoch versioning entirely, as if it were declared as 0.
Prevents errors such as:
/usr/bin/makepkg: line 244: ((: ! : syntax error: operand expected (error token is " ") ==> Finished making: cower-git :20110808-1 (Mon Aug 8 17:17:27 EDT 2011)
Signed-off-by: Dave Reisner<dreisner@archlinux.org> Signed-off-by: Dan McGee<dan@archlinux.org>
How do you ever get that?
# set defaults if they weren't specified in buildfile pkgbase=${pkgbase:-${pkgname[0]}} epoch=${epoch:-0}
So epoch should always be set... perhaps the real bug should be fixed.
Allan
Well, we're clearly inconsistant about it. I show some calls to get_full_version returning epoch as 0 and some returning epoch as a null string. It leads to a pkgver that's could possibly be something like ":20110808". Excerpts from my debugging: ==> Entering fakeroot environment... EPOCH=|0| FAKEROOTKEY=|1562776010| ==> Starting package()... ....stuff happens.... ==> Creating package... -> Generating .PKGINFO file... EPOCH=|| FAKEROOTKEY=|1562776010| /home/noclaf/src/c/pacman/scripts/makepkg: line 246: ((: ! : syntax error: operand expected (error token is "! ") -> Compressing package... EPOCH=|| FAKEROOTKEY=|1562776010| /home/noclaf/src/c/pacman/scripts/makepkg: line 246: ((: ! : syntax error: operand expected (error token is "! ") ==> Leaving fakeroot environment. EPOCH=|0| FAKEROOTKEY=|| ==> Finished making: cower-git 20110808-1 (Mon Aug 8 22:40:36 EDT 2011) So is it fakeroot fucking with us here? Doesn't seem to be, but somewhere along the line our epoch value is wrenched out from under us. NB: (( ! $epoch )) isn't the same as (( ! epoch )). One expands to 0 when its unset and the other throws a syntax error. d
On 09/08/11 12:44, Dave Reisner wrote:
On Tue, Aug 09, 2011 at 08:35:35AM +1000, Allan McRae wrote:
On 09/08/11 08:18, Dan McGee wrote:
commit 1a919a11b85cb882bf5e632036a9030e4a98aba0 Author: Dave Reisner<dreisner@archlinux.org> Date: Mon Aug 8 17:20:53 2011 -0400
makepkg: ignore epoch when undeclared
In this case, we skip the epoch versioning entirely, as if it were declared as 0.
Prevents errors such as:
/usr/bin/makepkg: line 244: ((: ! : syntax error: operand expected (error token is " ") ==> Finished making: cower-git :20110808-1 (Mon Aug 8 17:17:27 EDT 2011)
Signed-off-by: Dave Reisner<dreisner@archlinux.org> Signed-off-by: Dan McGee<dan@archlinux.org>
How do you ever get that?
# set defaults if they weren't specified in buildfile pkgbase=${pkgbase:-${pkgname[0]}} epoch=${epoch:-0}
So epoch should always be set... perhaps the real bug should be fixed.
Allan
Well, we're clearly inconsistant about it. I show some calls to get_full_version returning epoch as 0 and some returning epoch as a null string. It leads to a pkgver that's could possibly be something like ":20110808". Excerpts from my debugging:
==> Entering fakeroot environment...
EPOCH=|0| FAKEROOTKEY=|1562776010| ==> Starting package()...
....stuff happens....
==> Creating package... -> Generating .PKGINFO file...
EPOCH=|| FAKEROOTKEY=|1562776010| /home/noclaf/src/c/pacman/scripts/makepkg: line 246: ((: ! : syntax error: operand expected (error token is "! ") -> Compressing package...
EPOCH=|| FAKEROOTKEY=|1562776010| /home/noclaf/src/c/pacman/scripts/makepkg: line 246: ((: ! : syntax error: operand expected (error token is "! ") ==> Leaving fakeroot environment.
EPOCH=|0| FAKEROOTKEY=|| ==> Finished making: cower-git 20110808-1 (Mon Aug 8 22:40:36 EDT 2011)
So is it fakeroot fucking with us here? Doesn't seem to be, but somewhere along the line our epoch value is wrenched out from under us.
NB: (( ! $epoch )) isn't the same as (( ! epoch )). One expands to 0 when its unset and the other throws a syntax error.
Hmmm... that does look like it is getting lost when we go to fakeroot. But then why have we never had issues with pkgbase doing the same? I need to look into this further... Allan
participants (3)
-
Allan McRae
-
dan＠archlinux.org
-
Dave Reisner