- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Use title case for a heading in HACKING; fix capitalization of "Vim" in HACKING
by Jason St. John 31 Oct '13

31 Oct '13

Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> --- HACKING | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/HACKING b/HACKING index 068617f..1344644 100644 --- a/HACKING +++ b/HACKING @@ -6,11 +6,11 @@ concerns when hacking on pacman. If you are interested in contributing, please read link:submitting-patches.html[submitting-patches] and link:translation-help.html[translation-help] as well. -Coding style +Coding Style ------------ 1. All code should be indented with tabs. (Ignore the use of only spaces in - this file) By default, source files contain the following VIM modeline: + this file) By default, source files contain the following Vim modeline: + [source,C] ------------------------------------------- -- 1.8.4.2

1 0

[pacman-dev] Time for a 4.1.1 release?
by Allan McRae 31 Oct '13

31 Oct '13

It looks like the bug reports for 4.1 have stopped, so I guess we should make a maintenance release. There are a couple of new strings to be translated and a couple of issues reported with translations, so I will need to get those on transifex. See: here for a list of bugs reported/fixed: https://bugs.archlinux.org/index.php?do=index&tasks=&project=3&due=111&stat… The PKGBUILD proto files could have the prepare() function added just to be more complete and fix the remaining bug is someone wants to volunteer to do that... Anything I have missed? A bug not assigned to 4.1.1 that should be fixed? Allan

4 7

[pacman-dev] [PATCH] Remove spaces between the opening "if" and the opening parenthesis
by Jason St. John 31 Oct '13

31 Oct '13

Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> --- lib/libalpm/dload.c | 2 +- src/pacman/sync.c | 2 +- src/pacman/util.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 1032f7c..c74d2ad 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -547,7 +547,7 @@ static int curl_download_internal(struct dload_payload *payload, goto cleanup; } - if (payload->trust_remote_name) { + if(payload->trust_remote_name) { if(payload->content_disp_name) { /* content-disposition header has a better name for our file */ free(payload->destfile_name); diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 0002db6..e9b98fa 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -391,7 +391,7 @@ static int sync_group(int level, alpm_list_t *syncs, alpm_list_t *targets) } } } - if (!found) { + if(!found) { ret = 1; } } diff --git a/src/pacman/util.c b/src/pacman/util.c index 5960573..23eea98 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -611,7 +611,7 @@ static int table_display(const alpm_list_t *header, return -1; } - if (header) { + if(header) { table_print_line(header, padding, totalcols, widths, has_data); printf("\n"); } -- 1.8.4.2

1 0

[pacman-dev] [PATCH] makepkg: only remove static libraries if they have a shared version
by Allan McRae 31 Oct '13

31 Oct '13

It is fairly common that packages contain static libraries with no shared counterpart. These should not be removed with !staticlibs. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/PKGBUILD.5.txt | 2 +- doc/makepkg.conf.5.txt | 2 +- scripts/makepkg.sh.in | 8 +++++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 4ac7dc1..6c5ef84 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -250,7 +250,7 @@ A normal sync or upgrade will not use its value. *staticlibs*;; Leave static library (.a) files in packages. Specify `!staticlibs` to - remove them. + remove them (if they have a shared counterpart). *emptydirs*;; Leave empty directories in packages. diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index be5b809..ef64d17 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -162,7 +162,7 @@ Options *staticlibs*;; Leave static library (.a) files in packages. Specify `!staticlibs` to - remove them. + remove them (if they have a shared counterpart). *emptydirs*;; Leave empty directories in packages. diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index b2cc8e2..67bd7f1 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1584,7 +1584,13 @@ tidy_install() { if check_option "staticlibs" "n"; then msg2 "$(gettext "Removing static library files...")" - find . ! -type d -name "*.a" -exec rm -f -- '{}' + + local sl=($(find . ! -type d -name "*.a")) + local l + for l in "${sl[@]}"; do + if [[ -f "${l%.a}.so" ]]; then + rm -f "$l" + fi + done fi if check_option "emptydirs" "n"; then -- 1.8.4.2

3 4

[pacman-dev] [PATCH] makepkg: Allow "static library" to be translated
by Allan McRae 31 Oct '13

31 Oct '13

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 4cb8173..b2cc8e2 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1583,7 +1583,7 @@ tidy_install() { fi if check_option "staticlibs" "n"; then - msg2 "$(gettext "Removing "%s" files...")" "static library" + msg2 "$(gettext "Removing static library files...")" find . ! -type d -name "*.a" -exec rm -f -- '{}' + fi -- 1.8.4.2

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.1.2-190-gd5acf7a
by allan＠archlinux.org 31 Oct '13

31 Oct '13

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 d5acf7a44a41c0ac8224895a9f15f3d04e80811d (commit) via c3493360afdc4e74558f1a8016cdb3164f9dbc8f (commit) via 08191b13f2911b5f371824fbc224fe66c336bc76 (commit) via 1c5b94e6bbcf2e8e1c8bb2711465b98a894a9652 (commit) via b82a0d83ce3aede3cd82885439996359fa7e7e7b (commit) via 6405ecb25995e7cb4ec8b4603d6cfed9d58bf22a (commit) via 7e767b7e90755f5b8c90b37e68ae14098fba5520 (commit) via 8f5dbd56145a19d6f1ce951cec84ef5816f48349 (commit) via a8285350cc6c6e9400c53e2a24d984a4b242e434 (commit) via c2134fde2be179c490b33765fe5504be96291b95 (commit) via 2194eddf30bea718c2b5fd6b86d2a626783fc901 (commit) via 23923200c3e34563c8124a1b098bc0866f4e92e5 (commit) via d4ba5bdda6595db83babbac1c59fac129fcaff24 (commit) via d63313efe1502f97757028f55876f8accd9d9fe2 (commit) via 49de11b34014ced15b84fd38061b3d5aeb4db47c (commit) via 2d9e7dc2bcb71771b70d379f77212f0ce4a622f4 (commit) via 70b2c5f5ef7e81f61db9fada63c80514c3b163a5 (commit) via c7f159c1c94517a92c3a66208e534e1a983dddef (commit) from 968486ecc0c20f3b075ad9b903b9df862621610a (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 d5acf7a44a41c0ac8224895a9f15f3d04e80811d Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Thu Oct 24 09:22:54 2013 -0400 upgrade.c: use iterator variable remote was being used to loop over itself, making the FREELIST ineffective. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c3493360afdc4e74558f1a8016cdb3164f9dbc8f Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Oct 25 23:20:24 2013 -0400 deps.c: pass alpm_list** to _alpm_recursedeps Improves consistency and makes it clear that targs will be modified by _alpm_recursedeps. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 08191b13f2911b5f371824fbc224fe66c336bc76 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Thu Oct 24 19:52:59 2013 -0400 check for -1 return value from getopt_long getopt_long returns -1 when it has finished parsing all args. A return value of 0 indicates that a flag was set directly by getopt_long and parsing should continue. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 1c5b94e6bbcf2e8e1c8bb2711465b98a894a9652 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Thu Oct 24 09:22:53 2013 -0400 callback.c: check for negative xfered size Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b82a0d83ce3aede3cd82885439996359fa7e7e7b Author: Allan McRae <allan(a)archlinux.org> Date: Sun Oct 20 22:49:51 2013 +1000 makepkg: do not allow badly formatted arch lines It appears there are a lot of packages with arch=('i686 x86_64') floating around. Quote the arch array when passing as a parameter to detect such things. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 6405ecb25995e7cb4ec8b4603d6cfed9d58bf22a Author: Florian Pritz <bluewind(a)xinu.at> Date: Sat Oct 19 11:47:11 2013 +0200 pacman -Si/-Qi: Autodetect best fitting file size unit I've tracked this back to e223366 and it looks like this just forces KiB because back then humanize_size didn't exist, but the size was just divided by 1024 to keep it somewhat readable. When humanize_size got introduced in 3c8a448 this was just carried over. The unit detected for "Download Size" is reused for "Installed Size" to make it easier to read. Signed-off-by: Florian Pritz <bluewind(a)xinu.at> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7e767b7e90755f5b8c90b37e68ae14098fba5520 Author: Vladimir A. Nazarenko <naszar(a)ya.ru> Date: Sun Oct 20 15:57:24 2013 +1100 Use getuid instead of geteuid If someone gives the pacman binary setuid permissions, the geteuid check allows it to start running but subsequently fail. As we do not support setting pacman setuid, use getuid to check permissions instead. FS#37174. Signed-off-by: Vladimir A. Nazarenko <naszar(a)ya.ru> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8f5dbd56145a19d6f1ce951cec84ef5816f48349 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Oct 18 00:36:22 2013 -0400 libalpm/db.c: default to ALPM_DB_USAGE_ALL This allows existing front-ends other than pacman to continue working normally. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit a8285350cc6c6e9400c53e2a24d984a4b242e434 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Oct 18 00:32:20 2013 -0400 makepkg: allow empty source arrays Necessary for metapackages. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c2134fde2be179c490b33765fe5504be96291b95 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Thu Oct 17 23:38:58 2013 -0400 sortbydeps: include local pkgs in dep graph Detecting indirect dependencies by traversing a package's entire dependency tree is prohibitively slow for larger transactions. Instead add local packages to the dependency graph. This additionally requires delaying dependency ordering for sync operations so that removed packages may be excluded from dependency detection. tests/sync012.py was also updated to ensure that the dependency cycle was actually detected. Fixes FS#37380 Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2194eddf30bea718c2b5fd6b86d2a626783fc901 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Oct 15 14:54:57 2013 +1000 Indicate ignored packages in -Qu output Add "[ignored]" in the "pacman -Qu" output after packages that have their upgrades ignored. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 23923200c3e34563c8124a1b098bc0866f4e92e5 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Oct 16 12:23:11 2013 +1000 Expose alpm_pkg_should_ignore This function is useful for frontends to annotate package upgrades that will be ignored. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d4ba5bdda6595db83babbac1c59fac129fcaff24 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Oct 15 22:20:43 2013 +1000 repo-add.8: Provide example usage Detail the current standard of generating two databases - with and without the file list. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d63313efe1502f97757028f55876f8accd9d9fe2 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Oct 15 22:00:41 2013 +1000 makepkg.8: Document remaining environmental variables Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 49de11b34014ced15b84fd38061b3d5aeb4db47c Author: Allan McRae <allan(a)archlinux.org> Date: Tue Oct 15 21:29:23 2013 +1000 makepkg.8: document environmental variables that affect gpg signing Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2d9e7dc2bcb71771b70d379f77212f0ce4a622f4 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Oct 15 17:28:49 2013 +1000 Fix detection of joint --native and --foreign usage Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 70b2c5f5ef7e81f61db9fada63c80514c3b163a5 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Oct 15 16:21:33 2013 +1000 List signiture keyids in -Sii output Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c7f159c1c94517a92c3a66208e534e1a983dddef Author: Allan McRae <allan(a)archlinux.org> Date: Tue Oct 15 15:53:51 2013 +1000 Make functions to decode a signature and extract keyid public These are useful for frontends. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/makepkg.8.txt | 25 ++++++- doc/repo-add.8.txt | 13 ++++ lib/libalpm/alpm.h | 15 ++++ lib/libalpm/be_package.c | 2 +- lib/libalpm/db.c | 1 + lib/libalpm/deps.c | 167 +++++++++++++++++++----------------------- lib/libalpm/deps.h | 5 +- lib/libalpm/package.c | 2 +- lib/libalpm/package.h | 1 - lib/libalpm/remove.c | 6 +- lib/libalpm/signing.c | 6 +- lib/libalpm/signing.h | 5 -- lib/libalpm/sync.c | 27 ++++--- scripts/makepkg.sh.in | 6 +- src/pacman/callback.c | 2 +- src/pacman/package.c | 22 +++++- src/pacman/pacman.c | 17 ++--- src/pacman/query.c | 4 + src/pacman/upgrade.c | 6 +- test/pacman/tests/query006.py | 2 +- test/pacman/tests/sync012.py | 2 + 21 files changed, 195 insertions(+), 141 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] deps.c: pass alpm_list** to _alpm_recursedeps
by Andrew Gregory 26 Oct '13

26 Oct '13

Improves consistency and makes it clear that targs will be modified by _alpm_recursedeps. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/deps.c | 8 ++++---- lib/libalpm/deps.h | 2 +- lib/libalpm/remove.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 7cf2d36..4821281 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -589,7 +589,7 @@ static int can_remove_package(alpm_db_t *db, alpm_pkg_t *pkg, * @param include_explicit if 0, explicitly installed packages are not included * @return 0 on success, -1 on errors */ -int _alpm_recursedeps(alpm_db_t *db, alpm_list_t *targs, int include_explicit) +int _alpm_recursedeps(alpm_db_t *db, alpm_list_t **targs, int include_explicit) { alpm_list_t *i, *j; @@ -597,12 +597,12 @@ int _alpm_recursedeps(alpm_db_t *db, alpm_list_t *targs, int include_explicit) return -1; } - for(i = targs; i; i = i->next) { + for(i = *targs; i; i = i->next) { alpm_pkg_t *pkg = i->data; for(j = _alpm_db_get_pkgcache(db); j; j = j->next) { alpm_pkg_t *deppkg = j->data; if(_alpm_pkg_depends_on(pkg, deppkg) - && can_remove_package(db, deppkg, targs, include_explicit)) { + && can_remove_package(db, deppkg, *targs, include_explicit)) { alpm_pkg_t *copy; _alpm_log(db->handle, ALPM_LOG_DEBUG, "adding '%s' to the targets\n", deppkg->name); @@ -610,7 +610,7 @@ int _alpm_recursedeps(alpm_db_t *db, alpm_list_t *targs, int include_explicit) if(_alpm_pkg_dup(deppkg, &copy)) { return -1; } - targs = alpm_list_add(targs, copy); + *targs = alpm_list_add(*targs, copy); } } } diff --git a/lib/libalpm/deps.h b/lib/libalpm/deps.h index 8cf5ad2..d5ca236 100644 --- a/lib/libalpm/deps.h +++ b/lib/libalpm/deps.h @@ -32,7 +32,7 @@ alpm_depend_t *_alpm_dep_dup(const alpm_depend_t *dep); void _alpm_depmiss_free(alpm_depmissing_t *miss); alpm_list_t *_alpm_sortbydeps(alpm_handle_t *handle, alpm_list_t *targets, alpm_list_t *ignore, int reverse); -int _alpm_recursedeps(alpm_db_t *db, alpm_list_t *targs, int include_explicit); +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); diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 2e72852..7237a56 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -207,7 +207,7 @@ int _alpm_remove_prepare(alpm_handle_t *handle, alpm_list_t **data) if((trans->flags & ALPM_TRANS_FLAG_RECURSE) && !(trans->flags & ALPM_TRANS_FLAG_CASCADE)) { _alpm_log(handle, ALPM_LOG_DEBUG, "finding removable dependencies\n"); - if(_alpm_recursedeps(db, trans->remove, + if(_alpm_recursedeps(db, &trans->remove, trans->flags & ALPM_TRANS_FLAG_RECURSEALL)) { return -1; } @@ -251,7 +251,7 @@ int _alpm_remove_prepare(alpm_handle_t *handle, alpm_list_t **data) if((trans->flags & ALPM_TRANS_FLAG_CASCADE) && (trans->flags & ALPM_TRANS_FLAG_RECURSE)) { _alpm_log(handle, ALPM_LOG_DEBUG, "finding removable dependencies\n"); - if(_alpm_recursedeps(db, trans->remove, + if(_alpm_recursedeps(db, &trans->remove, trans->flags & ALPM_TRANS_FLAG_RECURSEALL)) { return -1; } -- 1.8.4.1

1 0

[pacman-dev] [PATCH] check for -1 return value from getopt_long
by Andrew Gregory 24 Oct '13

24 Oct '13

getopt_long returns -1 when it has finished parsing all args. A return value of 0 indicates that a flag was set directly by getopt_long and parsing should continue. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/pacman/pacman.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index f485692..5ae15ce 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -878,10 +878,8 @@ static int parseargs(int argc, char *argv[]) }; /* parse operation */ - while((opt = getopt_long(argc, argv, optstring, opts, &option_index))) { - if(opt < 0) { - break; - } else if(opt == 0) { + while((opt = getopt_long(argc, argv, optstring, opts, &option_index)) != -1) { + if(opt == 0) { continue; } else if(opt == '?') { /* unknown option, getopt printed an error */ @@ -905,10 +903,8 @@ static int parseargs(int argc, char *argv[]) /* parse all other options */ optind = 1; - while((opt = getopt_long(argc, argv, optstring, opts, &option_index))) { - if(opt < 0) { - break; - } else if(opt == 0) { + while((opt = getopt_long(argc, argv, optstring, opts, &option_index)) != -1) { + if(opt == 0) { continue; } else if(opt == '?') { /* this should have failed during first pass already */ -- 1.8.4.1

1 0

[pacman-dev] [PATCH] upgrade.c: use iterator variable
by Andrew Gregory 24 Oct '13

24 Oct '13

remote was being used to loop over itself, making the FREELIST ineffective. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/pacman/upgrade.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pacman/upgrade.c b/src/pacman/upgrade.c index 222f7fa..5495ea9 100644 --- a/src/pacman/upgrade.c +++ b/src/pacman/upgrade.c @@ -40,7 +40,7 @@ int pacman_upgrade(alpm_list_t *targets) { int retval = 0; - alpm_list_t *i, *remote = NULL; + alpm_list_t *i, *j, *remote = NULL; if(targets == NULL) { pm_printf(ALPM_LOG_ERROR, _("no targets specified (use -h for help)\n")); @@ -81,12 +81,12 @@ int pacman_upgrade(alpm_list_t *targets) printf(_("loading packages...\n")); /* add targets to the created transaction */ - for(i = targets; i; i = alpm_list_next(i), remote = alpm_list_next(remote)) { + for(i = targets, j = remote; i; i = alpm_list_next(i), j = alpm_list_next(j)) { const char *targ = i->data; alpm_pkg_t *pkg; alpm_siglevel_t level; - if(*(int *)remote->data) { + if(*(int *)j->data) { level = alpm_option_get_remote_file_siglevel(config->handle); } else { level = alpm_option_get_local_file_siglevel(config->handle); -- 1.8.4.1

1 0

[pacman-dev] [PATCH] callback.c: check for negative xfered size
by Andrew Gregory 24 Oct '13

24 Oct '13

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/pacman/callback.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index d0b7c40..36531a2 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -632,7 +632,7 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total) } /* bogus values : stop here */ - if(xfered > total) { + if(xfered > total || xfered < 0) { return; } -- 1.8.4.1

1 0