summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-06-07 11:41:16 -0500
committerDan McGee <dan@archlinux.org>2011-06-07 11:43:12 -0500
commit8c6a636cd970c19e7a79bb17c484b28454da877d (patch)
treecea080bbc11f9c0723db436e173a4ff18c511186 /lib
parentc7501148942159597677c2a8a738f0d59fdaa6dd (diff)
parente62566a7635449e3e35d757c4b3bb768479689ab (diff)
downloadpacman-8c6a636cd970c19e7a79bb17c484b28454da877d.tar.xz
Merge branch 'maint'
Conflicts: lib/libalpm/add.c
Diffstat (limited to 'lib')
-rw-r--r--lib/libalpm/add.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c
index 94ab1122..59d539c6 100644
--- a/lib/libalpm/add.c
+++ b/lib/libalpm/add.c
@@ -83,7 +83,7 @@ int SYMEXPORT alpm_add_pkg(pmpkg_t *pkg)
_alpm_log(PM_LOG_WARNING, _("%s-%s is up to date -- skipping\n"),
localpkgname, localpkgver);
return 0;
- } else {
+ } else if(!(trans->flags & PM_TRANS_FLAG_DOWNLOADONLY)) {
_alpm_log(PM_LOG_WARNING, _("%s-%s is up to date -- reinstalling\n"),
localpkgname, localpkgver);
}