Mostly for testing.

Signed-off-by: Andrew Gregory <[email protected]>
---
 doc/pacman.8.asciidoc |  6 +++---
 src/pacman/pacman.c   | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/doc/pacman.8.asciidoc b/doc/pacman.8.asciidoc
index 476c16f3..bb205627 100644
--- a/doc/pacman.8.asciidoc
+++ b/doc/pacman.8.asciidoc
@@ -241,6 +241,9 @@ Transaction Options (apply to '-S', '-R' and '-U')
 
 Upgrade Options (apply to '-S' and '-U')[[UO]]
 ----------------------------------------------
+*-w, \--downloadonly*::
+       Retrieve all packages from the server, but do not install/upgrade 
anything.
+
 *\--asdeps*::
        Install packages non-explicitly; in other words, fake their install 
reason
        to be installed as a dependency. This is useful for makepkg and other
@@ -445,9 +448,6 @@ can be useful when the user switches from a testing 
repository to a stable one.
 Additional targets can also be specified manually, so that '-Su foo' will do a
 system upgrade and install/upgrade the "foo" package in the same operation.
 
-*-w, \--downloadonly*::
-       Retrieve all packages from the server, but do not install/upgrade 
anything.
-
 *-y, \--refresh*::
        Download a fresh copy of the master package database from the server(s)
        defined in linkman:pacman.conf[5]. This should typically be used each 
time
diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c
index 3045a58e..cc280d41 100644
--- a/src/pacman/pacman.c
+++ b/src/pacman/pacman.c
@@ -161,7 +161,6 @@ static void usage(int op, const char * const myname)
                        addlist(_("  -q, --quiet          show less information 
for query and search\n"));
                        addlist(_("  -s, --search <regex> search remote 
repositories for matching strings\n"));
                        addlist(_("  -u, --sysupgrade     upgrade installed 
packages (-uu enables downgrades)\n"));
-                       addlist(_("  -w, --downloadonly   download packages but 
do not install/upgrade anything\n"));
                        addlist(_("  -y, --refresh        download fresh 
package databases from the server\n"
                                  "                       (-yy to force a 
refresh even if up to date)\n"));
                        addlist(_("      --needed         do not reinstall up 
to date packages\n"));
@@ -189,6 +188,7 @@ static void usage(int op, const char * const myname)
                switch(op) {
                        case PM_OP_SYNC:
                        case PM_OP_UPGRADE:
+                               addlist(_("  -w, --downloadonly   download 
packages but do not install/upgrade anything\n"));
                                addlist(_("      --overwrite <glob>\n"
                                          "                       overwrite 
conflicting files (can be used more than once)\n"));
                                addlist(_("      --asdeps         install 
packages as non-explicitly installed\n"));
@@ -735,6 +735,12 @@ static int parsearg_upgrade(int opt)
                case OP_IGNOREGROUP:
                        parsearg_util_addlist(&(config->ignoregrp));
                        break;
+               case OP_DOWNLOADONLY:
+               case 'w':
+                       config->op_s_downloadonly = 1;
+                       config->flags |= ALPM_TRANS_FLAG_DOWNLOADONLY;
+                       config->flags |= ALPM_TRANS_FLAG_NOCONFLICTS;
+                       break;
                default: return 1;
        }
        return 0;
@@ -820,12 +826,6 @@ static int parsearg_sync(int opt)
                case 'u':
                        (config->op_s_upgrade)++;
                        break;
-               case OP_DOWNLOADONLY:
-               case 'w':
-                       config->op_s_downloadonly = 1;
-                       config->flags |= ALPM_TRANS_FLAG_DOWNLOADONLY;
-                       config->flags |= ALPM_TRANS_FLAG_NOCONFLICTS;
-                       break;
                case OP_REFRESH:
                case 'y':
                        (config->op_s_sync)++;
-- 
2.30.0

Reply via email to