From 5af076f09f67bb3abd80a28fa3f33437f08b18bc Mon Sep 17 00:00:00 2001 From: Chantry Xavier Date: Sat, 15 Mar 2008 21:10:54 +0100 Subject: Kill the dependsonly option. From the man page : "This is pretty useless and we're not sure why it even exists." Signed-off-by: Chantry Xavier --- contrib/bash_completion | 1 - contrib/zsh_completion | 1 - doc/pacman.8.txt | 4 ---- lib/libalpm/alpm.h | 2 +- lib/libalpm/sync.c | 12 +++--------- pactest/tests/sync1001.py | 18 ------------------ pactest/tests/sync1002.py | 19 ------------------- src/pacman/conf.h | 1 - src/pacman/pacman.c | 3 --- 9 files changed, 4 insertions(+), 57 deletions(-) delete mode 100644 pactest/tests/sync1001.py delete mode 100644 pactest/tests/sync1002.py diff --git a/contrib/bash_completion b/contrib/bash_completion index bfe33908..11f021c8 100644 --- a/contrib/bash_completion +++ b/contrib/bash_completion @@ -261,7 +261,6 @@ _pacman () --asexplicit \ -c --clean \ -d --nodeps \ - -e --dependsonly \ -f --force \ -g --groups \ -h --help \ diff --git a/contrib/zsh_completion b/contrib/zsh_completion index eeef7d5f..e1273184 100644 --- a/contrib/zsh_completion +++ b/contrib/zsh_completion @@ -77,7 +77,6 @@ _pacman_opts_sync_actions=( # options for passing to _arguments: options for --sync command _pacman_opts_sync_modifiers=( '-d[Skip dependency checks]' - '-e[Install dependencies only]' '-f[Overwrite conflicting files]' '-i[View package information]' '-l[List all packages in a repository]' diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index bbb25c64..6f6942d7 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -245,10 +245,6 @@ Sync Options[[SO]] from the cache. In both cases, you will have a yes or no option to remove packages and/or unused downloaded databases. -*-e, \--dependsonly*:: - Install all dependencies of a package, but not the specified package - itself. This is pretty useless and we're not sure why it even exists. - *-g, \--groups*:: Display all the members for each package group specified. If no group names are provided, all groups will be listed; pass the flag twice to diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 8296bc7d..0a8812ad 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -271,7 +271,7 @@ typedef enum _pmtransflag_t { PM_TRANS_FLAG_CASCADE = 0x10, PM_TRANS_FLAG_RECURSE = 0x20, PM_TRANS_FLAG_DBONLY = 0x40, - PM_TRANS_FLAG_DEPENDSONLY = 0x80, + /* 0x80 flag can go here */ PM_TRANS_FLAG_ALLDEPS = 0x100, PM_TRANS_FLAG_DOWNLOADONLY = 0x200, PM_TRANS_FLAG_NOSCRIPTLET = 0x400, diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index ea2d3143..9df59431 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -393,11 +393,9 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync *data = NULL; } - if(!(trans->flags & PM_TRANS_FLAG_DEPENDSONLY)) { - for(i = trans->packages; i; i = i->next) { - pmsyncpkg_t *sync = i->data; - list = alpm_list_add(list, sync->pkg); - } + for(i = trans->packages; i; i = i->next) { + pmsyncpkg_t *sync = i->data; + list = alpm_list_add(list, sync->pkg); } if(!(trans->flags & PM_TRANS_FLAG_NODEPS)) { @@ -423,10 +421,6 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync } } - if((trans->flags & PM_TRANS_FLAG_DEPENDSONLY)) { - FREELIST(trans->packages); - } - for(i = list; i; i = i->next) { /* add the dependencies found by resolvedeps to the transaction set */ pmpkg_t *spkg = i->data; diff --git a/pactest/tests/sync1001.py b/pactest/tests/sync1001.py deleted file mode 100644 index 6c4aabcf..00000000 --- a/pactest/tests/sync1001.py +++ /dev/null @@ -1,18 +0,0 @@ -self.description = "Test -Se (ensure specified package is not installed)" - -sp1 = pmpkg("dummy") -sp1.depends = [ "dep1", "dep2" ] -self.addpkg2db("sync", sp1) - -sp2 = pmpkg("dep1") -self.addpkg2db("sync", sp2) - -sp3 = pmpkg("dep2") -self.addpkg2db("sync", sp3) - -self.args = "-Se dummy" - -self.addrule("PACMAN_RETCODE=0") -self.addrule("PKG_EXIST=dep1") -self.addrule("PKG_EXIST=dep2") -self.addrule("!PKG_EXIST=dummy") diff --git a/pactest/tests/sync1002.py b/pactest/tests/sync1002.py deleted file mode 100644 index c158838b..00000000 --- a/pactest/tests/sync1002.py +++ /dev/null @@ -1,19 +0,0 @@ -self.description = "Test -Se (resolve the dependencies' dependencies )" - -sp1 = pmpkg("pkg1") -sp1.depends = [ "pkg2" ] -self.addpkg2db("sync", sp1) - -sp2 = pmpkg("pkg2") -sp2.depends = [ "pkg3" ] -self.addpkg2db("sync", sp2) - -sp3 = pmpkg("pkg3") -self.addpkg2db("sync", sp3) - -self.args = "-Se pkg1 pkg3" - -self.addrule("PACMAN_RETCODE=0") -self.addrule("PKG_EXIST=pkg2") -self.addrule("PKG_EXIST=pkg3") -self.addrule("!PKG_EXIST=pkg1") diff --git a/src/pacman/conf.h b/src/pacman/conf.h index d53db08f..a28c77f4 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -52,7 +52,6 @@ typedef struct __config_t { unsigned short op_q_upgrade; unsigned short op_s_clean; - unsigned short op_s_dependsonly; unsigned short op_s_downloadonly; unsigned short op_s_info; unsigned short op_s_sync; diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 308d1dd4..6bc284a3 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -114,7 +114,6 @@ static void usage(int op, const char * const myname) printf(_(" --asexplicit install packages as explicitly installed\n")); printf(_(" -c, --clean remove old packages from cache directory (-cc for all)\n")); printf(_(" -d, --nodeps skip dependency checks\n")); - printf(_(" -e, --dependsonly install dependencies only\n")); printf(_(" -f, --force force install, overwrite conflicting files\n")); printf(_(" -g, --groups view all members of a package group\n")); printf(_(" -i, --info view package information\n")); @@ -314,7 +313,6 @@ static int parseargs(int argc, char *argv[]) {"clean", no_argument, 0, 'c'}, {"nodeps", no_argument, 0, 'd'}, {"deps", no_argument, 0, 'd'}, - {"dependsonly",no_argument, 0, 'e'}, {"explicit", no_argument, 0, 'e'}, {"force", no_argument, 0, 'f'}, {"groups", no_argument, 0, 'g'}, @@ -444,7 +442,6 @@ static int parseargs(int argc, char *argv[]) break; case 'e': config->op_q_explicit = 1; - config->flags |= PM_TRANS_FLAG_DEPENDSONLY; break; case 'f': config->flags |= PM_TRANS_FLAG_FORCE; break; case 'g': (config->group)++; break; -- cgit v1.2.3-70-g09d2