cli: enforce argument to upgrade command

[oweals/opkg-lede.git] / src / opkg-cl.c

diff --git a/src/opkg-cl.c b/src/opkg-cl.c
index ebaa3d063e9d851c788ff317adfa2835ffa1cfff..c4e4492b3a7e98518a2577756f7aeecc843ba688 100644 (file)
--- a/src/opkg-cl.c
+++ b/src/opkg-cl.c
@@ -28,6 +28,7 @@
 #include "opkg_cmd.h"
 #include "file_util.h"
 #include "opkg_message.h"
+#include "opkg_download.h"
 #include "../libbb/libbb.h"
 
 enum {
@@ -40,6 +41,7 @@ enum {
        ARGS_OPT_FORCE_REMOVAL_OF_ESSENTIAL_PACKAGES,
        ARGS_OPT_FORCE_SPACE,
        ARGS_OPT_FORCE_POSTINSTALL,
+       ARGS_OPT_FORCE_REMOVE,
        ARGS_OPT_ADD_ARCH,
        ARGS_OPT_ADD_DEST,
        ARGS_OPT_NOACTION,
@@ -79,6 +81,8 @@ static struct option long_options[] = {
                ARGS_OPT_FORCE_REMOVAL_OF_ESSENTIAL_PACKAGES},
        {"force-postinstall", 0, 0, ARGS_OPT_FORCE_POSTINSTALL},
        {"force_postinstall", 0, 0, ARGS_OPT_FORCE_POSTINSTALL},
+       {"force-remove", 0, 0, ARGS_OPT_FORCE_REMOVE},
+       {"force_remove", 0, 0, ARGS_OPT_FORCE_REMOVE},
        {"noaction", 0, 0, ARGS_OPT_NOACTION},
        {"download-only", 0, 0, ARGS_OPT_DOWNLOAD_ONLY},
        {"nodeps", 0, 0, ARGS_OPT_NODEPS},
@@ -166,6 +170,9 @@ args_parse(int argc, char *argv[])
                case ARGS_OPT_FORCE_POSTINSTALL:
                        conf->force_postinstall = 1;
                        break;
+               case ARGS_OPT_FORCE_REMOVE:
+                       conf->force_remove = 1;
+                       break;
                case ARGS_OPT_NODEPS:
                        conf->nodeps = 1;
                        break;
@@ -214,7 +221,7 @@ usage()
 
        printf("\nPackage Manipulation:\n");
        printf("\tupdate                        Update list of available packages\n");
-       printf("\tupgrade                       Upgrade installed packages\n");
+       printf("\tupgrade <pkgs>                Upgrade packages\n");
        printf("\tinstall <pkgs>                Install package(s)\n");
        printf("\tconfigure <pkgs>      Configure unpacked package(s)\n");
        printf("\tremove <pkgs|regexp>  Remove package(s)\n");
@@ -225,6 +232,7 @@ usage()
        printf("\tlist                  List available packages\n");
        printf("\tlist-installed                List installed packages\n");
        printf("\tlist-upgradable               List installed and upgradable packages\n");
+       printf("\tlist-changed-conffiles        List user modified configuration files\n");
        printf("\tfiles <pkg>           List files belonging to <pkg>\n");
        printf("\tsearch <file|regexp>  List package providing <file>\n");
        printf("\tinfo [pkg|regexp]     Display all info for <pkg>\n");
@@ -233,8 +241,11 @@ usage()
        printf("\tcompare-versions <v1> <op> <v2>\n");
        printf("\t                    compare versions using <= < > >= = << >>\n");
        printf("\tprint-architecture    List installable package architectures\n");
+       printf("\tdepends [-A] [pkgname|pat]+\n");
        printf("\twhatdepends [-A] [pkgname|pat]+\n");
        printf("\twhatdependsrec [-A] [pkgname|pat]+\n");
+       printf("\twhatrecommends[-A] [pkgname|pat]+\n");
+       printf("\twhatsuggests[-A] [pkgname|pat]+\n");
        printf("\twhatprovides [-A] [pkgname|pat]+\n");
        printf("\twhatconflicts [-A] [pkgname|pat]+\n");
        printf("\twhatreplaces [-A] [pkgname|pat]+\n");
@@ -269,6 +280,7 @@ usage()
        printf("\t--force-downgrade     Allow opkg to downgrade packages\n");
        printf("\t--force-space         Disable free space checks\n");
        printf("\t--force-postinstall   Run postinstall scripts even in offline mode\n");
+       printf("\t--force-remove        Remove package even if prerm script fails\n");
        printf("\t--noaction            No action -- test only\n");
        printf("\t--download-only       No action -- download only\n");
        printf("\t--nodeps              Do not follow dependencies\n");
@@ -328,6 +340,8 @@ main(int argc, char *argv[])
            !strcmp(cmd_name,"compare-versions") ||
            !strcmp(cmd_name,"list_installed") ||
            !strcmp(cmd_name,"list-installed") ||
+           !strcmp(cmd_name,"list_changed_conffiles") ||
+           !strcmp(cmd_name,"list-changed-conffiles") ||
            !strcmp(cmd_name,"status") )
                noreadfeedsfile = 1;