[gentoo-commits] proj/portage-utils:master commit in: /

[Fabian Groffen]

commit:     114e15337d3297577887297734ac83fcdbde74f1
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed May 15 09:39:19 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed May 15 09:39:19 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=114e1533

qmerge: only fetch Packages when -f is specified

-F used to prevent fetching Packages
-f used to force fetching Packages
   default was to fetch Packages if not found

with this commit

-F prevents fetching Packages
-f forces fetching Packages
   default does no fetching

(which still misnames the options, but honestly one or both should go
to fix this odd situation)

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 TODO.md  |  2 ++
 qmerge.c | 10 ++++------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/TODO.md b/TODO.md
index 88d232f..99078d5 100644
--- a/TODO.md
+++ b/TODO.md
@@ -56,6 +56,8 @@
 - merge duplicate atoms on the CLI (`qmerge -Uq nano nano nano`)
 - unmerging should clean out @world set
 - test should work on local vdb (so TRAVIS can test it too)
+- fixup lame misnaming of force\_download (--fetch/--force) actually
+  not-forcing things
 
 # qdepends
 

diff --git a/qmerge.c b/qmerge.c
index a144805..088e3b7 100644
--- a/qmerge.c
+++ b/qmerge.c
@@ -263,13 +263,11 @@ qmerge_initialize(void)
        mkdir_p(buf, 0755);
        xchdir(buf);
 
-       if (force_download != 2) {
-               if (force_download)
-                       unlink(Packages);
-
-               if (access(Packages, R_OK) != 0)
-                       fetch(buf, Packages);
+       if (force_download == 1 /* -f: fetch */) {
+               unlink(Packages);
+               fetch(buf, Packages);
        }
+
        free(buf);
 }