aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2018-04-05 20:23:54 +0200
committerFabian Groffen <grobian@gentoo.org>2018-04-05 20:23:54 +0200
commit3ba7c294e8aa701c38a251728843c1a954f68c38 (patch)
tree9953f1ab1dbe6e525babaf8821c0660972e5c2a8
parentxstrdup: avoid warning about clobbering t (diff)
downloadportage-utils-3ba7c294e8aa701c38a251728843c1a954f68c38.tar.gz
portage-utils-3ba7c294e8aa701c38a251728843c1a954f68c38.tar.bz2
portage-utils-3ba7c294e8aa701c38a251728843c1a954f68c38.zip
Revert "qmerge: Only fetch Packages if -f/-F is specified"
This commit changed the logic from fetching Packages when -f is set, to forcing when -F is set. This is contradicting the documented behaviour and broke the tests. It is not clear to me anymore why this change was necessary, so I'm reverging it. This reverts commit eedb0ea266b78efd84bc34bc2c6602fb713ba590.
-rw-r--r--qmerge.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/qmerge.c b/qmerge.c
index 960a9a4..583e4fb 100644
--- a/qmerge.c
+++ b/qmerge.c
@@ -190,8 +190,8 @@ qmerge_initialize(void)
mkdir_p(buf, 0755);
xchdir(buf);
- if (force_download) {
- if (force_download == 2)
+ if (force_download != 2) {
+ if (force_download)
unlink(Packages);
if (access(Packages, R_OK) != 0)