- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Add a slightly simpler versioned replace test
by Dan McGee 09 Aug '11

09 Aug '11

It turns out we have a few problems here which are best tackled independently. The first is simply parsing replacements as dep strings; the second will be dealing with replaces when the original package name still exists in the repository. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- Note the commit diffstat looks a bit weird (as does the diff); I just wanted to have two very similar tests numbered next to each other so I moved the next one up to the next block of 10. 101 and 102 are almost the same; the only difference is the to be replaced package is still in the repos in 102 (albeit a newer version). -Dan test/pacman/tests/replace101.py | 7 +------ test/pacman/tests/{replace101.py => replace102.py} | 2 +- test/pacman/tests/{replace102.py => replace110.py} | 0 3 files changed, 2 insertions(+), 7 deletions(-) copy test/pacman/tests/{replace101.py => replace102.py} (88%) rename test/pacman/tests/{replace102.py => replace110.py} (100%) diff --git a/test/pacman/tests/replace101.py b/test/pacman/tests/replace101.py index 86c40ac..ee0f860 100644 --- a/test/pacman/tests/replace101.py +++ b/test/pacman/tests/replace101.py @@ -1,4 +1,4 @@ -self.description = "Sysupgrade with a versioned replacement" +self.description = "Sysupgrade with a versioned replacement, original disappears" sp1 = pmpkg("python2-yaml", "5-1") sp1.replaces = ["python-yaml<5"] @@ -6,11 +6,6 @@ sp1.files = ["lib/python2/file"] self.addpkg2db("sync", sp1) -# the python3 version -sp2 = pmpkg("python-yaml", "5-1") -sp2.files = ["lib/python3/file"] -self.addpkg2db("sync", sp2) - lp1 = pmpkg("python-yaml", "4-1") lp1.files = ["lib/python2/file"] self.addpkg2db("local", lp1) diff --git a/test/pacman/tests/replace101.py b/test/pacman/tests/replace102.py similarity index 88% copy from test/pacman/tests/replace101.py copy to test/pacman/tests/replace102.py index 86c40ac..ca05d4e 100644 --- a/test/pacman/tests/replace101.py +++ b/test/pacman/tests/replace102.py @@ -1,4 +1,4 @@ -self.description = "Sysupgrade with a versioned replacement" +self.description = "Sysupgrade with a versioned replacement, original stays" sp1 = pmpkg("python2-yaml", "5-1") sp1.replaces = ["python-yaml<5"] diff --git a/test/pacman/tests/replace102.py b/test/pacman/tests/replace110.py similarity index 100% rename from test/pacman/tests/replace102.py rename to test/pacman/tests/replace110.py -- 1.7.6

1 0

[pacman-dev] [PATCH] Conflict comparison performance enhancements
by Dan McGee 09 Aug '11

09 Aug '11

* Add *_hash fields to conflict struct and populate them * Remove unnecessary backwards string comparisons Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/alpm.h | 2 ++ lib/libalpm/conflict.c | 34 +++++++++++++++++----------------- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 8a95f26..32db687 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -151,6 +151,8 @@ typedef struct _alpm_depmissing_t { /** Conflict */ typedef struct _alpm_conflict_t { + unsigned long package1_hash; + unsigned long package2_hash; char *package1; char *package2; char *reason; diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 538c4c7..91e6b67 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -41,15 +41,17 @@ #include "log.h" #include "deps.h" -static alpm_conflict_t *conflict_new(const char *package1, const char *package2, +static alpm_conflict_t *conflict_new(alpm_pkg_t *pkg1, alpm_pkg_t *pkg2, const char *reason) { alpm_conflict_t *conflict; MALLOC(conflict, sizeof(alpm_conflict_t), return NULL); - STRDUP(conflict->package1, package1, return NULL); - STRDUP(conflict->package2, package2, return NULL); + conflict->package1_hash = pkg1->name_hash; + conflict->package2_hash = pkg2->name_hash; + STRDUP(conflict->package1, pkg1->name, return NULL); + STRDUP(conflict->package2, pkg2->name, return NULL); STRDUP(conflict->reason, reason, return NULL); return conflict; @@ -68,6 +70,8 @@ alpm_conflict_t *_alpm_conflict_dup(const alpm_conflict_t *conflict) alpm_conflict_t *newconflict; CALLOC(newconflict, 1, sizeof(alpm_conflict_t), return NULL); + newconflict->package1_hash = conflict->package1_hash; + newconflict->package2_hash = conflict->package2_hash; STRDUP(newconflict->package1, conflict->package1, return NULL); STRDUP(newconflict->package2, conflict->package2, return NULL); STRDUP(newconflict->reason, conflict->reason, return NULL); @@ -78,15 +82,12 @@ alpm_conflict_t *_alpm_conflict_dup(const alpm_conflict_t *conflict) static int conflict_isin(alpm_conflict_t *needle, alpm_list_t *haystack) { alpm_list_t *i; - const char *npkg1 = needle->package1; - const char *npkg2 = needle->package2; - for(i = haystack; i; i = i->next) { alpm_conflict_t *conflict = i->data; - const char *cpkg1 = conflict->package1; - const char *cpkg2 = conflict->package2; - if((strcmp(cpkg1, npkg1) == 0 && strcmp(cpkg2, npkg2) == 0) - || (strcmp(cpkg1, npkg2) == 0 && strcmp(cpkg2, npkg1) == 0)) { + if(needle->package1_hash == conflict->package1_hash + && needle->package2_hash == conflict->package2_hash + && strcmp(needle->package1, conflict->package1) == 0 + && strcmp(needle->package2, conflict->package2) == 0) { return 1; } } @@ -102,14 +103,14 @@ static int conflict_isin(alpm_conflict_t *needle, alpm_list_t *haystack) * @param reason reason for this conflict */ static int add_conflict(alpm_handle_t *handle, alpm_list_t **baddeps, - const char *pkg1, const char *pkg2, const char *reason) + alpm_pkg_t *pkg1, alpm_pkg_t *pkg2, const char *reason) { alpm_conflict_t *conflict = conflict_new(pkg1, pkg2, reason); if(!conflict) { return -1; } _alpm_log(handle, ALPM_LOG_DEBUG, "package %s conflicts with %s (by %s)\n", - pkg1, pkg2, reason); + pkg1->name, pkg2->name, reason); if(!conflict_isin(conflict, *baddeps)) { *baddeps = alpm_list_add(*baddeps, conflict); } else { @@ -140,7 +141,6 @@ static void check_conflict(alpm_handle_t *handle, } for(i = list1; i; i = i->next) { alpm_pkg_t *pkg1 = i->data; - const char *pkg1name = alpm_pkg_get_name(pkg1); alpm_list_t *j; for(j = alpm_pkg_get_conflicts(pkg1); j; j = j->next) { @@ -150,18 +150,18 @@ static void check_conflict(alpm_handle_t *handle, for(k = list2; k; k = k->next) { alpm_pkg_t *pkg2 = k->data; - const char *pkg2name = alpm_pkg_get_name(pkg2); - if(strcmp(pkg1name, pkg2name) == 0) { + if(pkg1->name_hash == pkg2->name_hash + && strcmp(pkg1->name, pkg2->name) == 0) { /* skip the package we're currently processing */ continue; } if(_alpm_depcmp(pkg2, parsed_conflict)) { if(order >= 0) { - add_conflict(handle, baddeps, pkg1name, pkg2name, conflict); + add_conflict(handle, baddeps, pkg1, pkg2, conflict); } else { - add_conflict(handle, baddeps, pkg2name, pkg1name, conflict); + add_conflict(handle, baddeps, pkg2, pkg1, conflict); } } } -- 1.7.6

1 0

[pacman-dev] [PATCH] Don't walk off front of string when stripping newline
by Dan McGee 09 Aug '11

09 Aug '11

If the string was zero-length to begin with, or consists of only newline characters, nothing stopped us from incrementing right off the front of the string. Ensure len stays above zero the whole time. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/util.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index bd0526c..adb1d19 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -219,7 +219,7 @@ size_t _alpm_strip_newline(char *str) return 0; } len = strlen(str); - while(str[len - 1] == '\n') { + while(len > 0 && str[len - 1] == '\n') { len--; } str[len] = '\0'; -- 1.7.6

1 0

[pacman-dev] [PATCH] Fix compile error when curl is not used
by Dan McGee 09 Aug '11

09 Aug '11

Noticed in my PowerPC Linux VM: cc1: warnings being treated as errors dload.c:45: error: 'get_filename' defined but not used make[3]: *** [dload.lo] Error 1 Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/dload.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index dc4f91e..ac47e94 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -42,6 +42,9 @@ #include "util.h" #include "handle.h" +#ifdef HAVE_LIBCURL +static double prevprogress; /* last download amount */ + static const char *get_filename(const char *url) { char *filename = strrchr(url, '/'); @@ -51,9 +54,6 @@ static const char *get_filename(const char *url) return filename; } -#ifdef HAVE_LIBCURL -static double prevprogress; /* last download amount */ - static char *get_fullpath(const char *path, const char *filename, const char *suffix) { -- 1.7.6

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.3-548-g9a40927
by dan＠archlinux.org 09 Aug '11

09 Aug '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 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(a)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(a)archlinux.org> commit 09f950af073ca82b03ef50dd6402fd72491a4770 Author: Dan McGee <dan(a)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(a)archlinux.org> commit 8fa330335f9eb465724ed778464502f844e930ae Merge: ef4757a 6744533 Author: Dan McGee <dan(a)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(a)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(a)archlinux.org> commit d9f9b87d3ff6621577aa15bf3304f73219f6d5f1 Author: Dan McGee <dan(a)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(a)archlinux.org> commit 1d37c19e0492ddd426c7a05c815a45b997b55498 Author: Dave Reisner <dreisner(a)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(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5136df0f393567117b84d4580737e2920cc63f57 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Aug 7 19:46:41 2011 -0400 paccache: use pacsort instead of sort -V Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b283a1e06576821de6b3811a76b43ad081870dab Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Aug 7 15:32:06 2011 -0400 src/util/Makefile.am: alphabetize targets Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0b57da2a43128dfaf475038eef938cae9cc24de1 Author: Dave Reisner <dreisner(a)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(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit fab66f157d1b622cb120e21373a4893ad693ff33 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Aug 8 14:27:31 2011 -0500 Bash-ify test/util/vercmptest.sh Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1a919a11b85cb882bf5e632036a9030e4a98aba0 Author: Dave Reisner <dreisner(a)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(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1e16b94a85678bc6d055e19f0efbd5bb680c5032 Author: Dave Reisner <dreisner(a)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(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 07a1292721c62f44d89a9fe6a0b093b5e6865b8a Author: Dan McGee <dan(a)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(a)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%2Flibalpm%2Fpo%2Fsr(a)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%2Fpo%2Fsr(a)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%2Fpacman%2Fpo%2Fsr(a)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

3 3

[pacman-dev] Checking package validity
by Allan McRae 09 Aug '11

09 Aug '11

I was thinking of how we currently check package validity and had planned to do something like: 1) signature check 2) md5sum check _only_ if no signature to check with the intention of adding an sha256sum check in the middle in the future (perhaps only if pacman is built using openssl to save us having to provide the routines...). But as far as I can tell, _alpm_check_pgp_helper does not allow you to distinguish between a successful signature check and the case where no signature is available and signature checking is not required. Is that correct or am I missing something? Allan

2 3

[pacman-dev] Bad strings for translation
by Dan McGee 09 Aug '11

09 Aug '11

Noticed the following today in makepkg, we should be using warning() calls instead so this same word isn't translated over and over: + +msgid "Warning: Unknown public key" +msgstr "" + +msgid "Warning: the key has been revoked." +msgstr "" + +msgid "Warning: the signature has expired." +msgstr "" + +msgid "Warning: the key has expired." +msgstr "" +

2 1

[pacman-dev] [PATCH] Fix divide by zero when downloading zero length files
by Dan McGee 08 Aug '11

08 Aug '11

If someone did a 'touch bogusrepo.db', we had the potential to throw a SIGFPE or divide by zero, given that the total file size was 0 and getting passed up to the pacman callback. Fix this so we get weird but sane output and don't blow up when downloading: :: Synchronizing package databases... core 35.7K 306.7K/s 00:00:00 [###################] 100% bogusrepo 0.0K 0.0K/s 00:00:00 [###################] 100% Exception as seen in gdb: Program received signal SIGFPE, Arithmetic exception. 0x000000000040cc73 in cb_dl_progress (filename=0x619dfc "bogusrepo.db", file_xfered=0, file_total=0) at callback.c:584 584 file_percent = (file_xfered * 100) / file_total; Signed-off-by: Dan McGee <dan(a)archlinux.org> --- This is for maint, where this can be easily reproduced by adding a file:// URL to a zero-length database and running -Syy. It doesn't show up on master not because the code is different, but because curl never even calls the callback once on a zero length file, so we don't hit the problem. -Dan src/pacman/callback.c | 25 +++++++++++++++++++------ 1 files changed, 19 insertions(+), 6 deletions(-) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 46ff2e8..68672b4 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -27,6 +27,7 @@ #include <sys/types.h> /* off_t */ #include <unistd.h> #include <wchar.h> +#include <limits.h> /* UINT_MAX */ #include <alpm.h> @@ -561,10 +562,13 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total) diff_sec = current_time.tv_sec - initial_time.tv_sec; diff_usec = current_time.tv_usec - initial_time.tv_usec; timediff = diff_sec + (diff_usec / 1000000.0); - rate = xfered / (timediff * 1024.0); - - /* round elapsed time to the nearest second */ - eta_s = (int)(timediff + 0.5); + if(timediff > 0.0) { + rate = xfered / (timediff * 1024.0); + /* round elapsed time to the nearest second */ + eta_s = (unsigned int)(timediff + 0.5); + } else { + eta_s = 0; + } } else { /* compute current average values */ timediff = get_update_timediff(0); @@ -576,12 +580,20 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total) rate = (xfered - xfered_last) / (timediff * 1024.0); /* average rate to reduce jumpiness */ rate = (rate + 2 * rate_last) / 3; - eta_s = (total - xfered) / (rate * 1024.0); + if(rate > 0.0) { + eta_s = (total - xfered) / (rate * 1024.0); + } else { + eta_s = UINT_MAX; + } rate_last = rate; xfered_last = xfered; } - file_percent = (file_xfered * 100) / file_total; + if(file_total) { + file_percent = (file_xfered * 100) / file_total; + } else { + file_percent = 100; + } if(totaldownload) { total_percent = ((list_xfered + file_xfered) * 100) / @@ -658,6 +670,7 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total) } /* 1 space + filenamelen + 1 space + 7 for size + 1 + 7 for rate + 2 for /s + 1 space + 8 for eta */ + /* TODO: if eta_h > 99, formatting gets all messed up */ printf(" %ls%-*s %6.1f%c %#6.1f%c/s %02u:%02u:%02u", wcfname, padwid, "", f_xfered, xfered_size, rate, rate_size, eta_h, eta_m, eta_s); -- 1.7.6

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.3-549-g21240d4
by dan＠archlinux.org 08 Aug '11

08 Aug '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 21240d4746be470b2cdabf106289034cbd27c579 (commit) from 9a409275330bfe6c4865ab3c5ecc384a26d85e45 (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 21240d4746be470b2cdabf106289034cbd27c579 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Aug 8 17:45:44 2011 -0500 Update transifex config for new translation layout Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: .tx/config | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.5.3-12-g6744533
by dan＠archlinux.org 08 Aug '11

08 Aug '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 67445334e71eaf6138561eee8e5561733a59fc69 (commit) via 4c37d74ae50fc7c0f067aca07164fe75516d055b (commit) via 88644e181db49f3f94e6891166823fd5f46acbcc (commit) via 005eab0a080925d0d6f780d751f9019dafbafc64 (commit) from 297cd7897bfe060ce46d703e15ad7cbe37aedced (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: doc/PKGBUILD.5.txt | 3 +-- lib/libalpm/dload.c | 1 + lib/libalpm/po/fi.po | 17 +++++++++++------ lib/libalpm/po/libalpm.pot | 4 ++-- po/de.po | 18 +++++++++++------- po/fi.po | 13 ++++++++----- po/pacman.pot | 4 ++-- src/pacman/sync.c | 11 ++++++++++- src/pacman/util.c | 38 +++++++++++++++++++++++++++++++++++--- 9 files changed, 81 insertions(+), 28 deletions(-) hooks/post-receive -- The official pacman repository

1 0