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 <shiningxc@gmail.com>
This commit is contained in:
parent
2f8fb80ee6
commit
5af076f09f
9 changed files with 4 additions and 57 deletions
|
@ -261,7 +261,6 @@ _pacman ()
|
||||||
--asexplicit \
|
--asexplicit \
|
||||||
-c --clean \
|
-c --clean \
|
||||||
-d --nodeps \
|
-d --nodeps \
|
||||||
-e --dependsonly \
|
|
||||||
-f --force \
|
-f --force \
|
||||||
-g --groups \
|
-g --groups \
|
||||||
-h --help \
|
-h --help \
|
||||||
|
|
|
@ -77,7 +77,6 @@ _pacman_opts_sync_actions=(
|
||||||
# options for passing to _arguments: options for --sync command
|
# options for passing to _arguments: options for --sync command
|
||||||
_pacman_opts_sync_modifiers=(
|
_pacman_opts_sync_modifiers=(
|
||||||
'-d[Skip dependency checks]'
|
'-d[Skip dependency checks]'
|
||||||
'-e[Install dependencies only]'
|
|
||||||
'-f[Overwrite conflicting files]'
|
'-f[Overwrite conflicting files]'
|
||||||
'-i[View package information]'
|
'-i[View package information]'
|
||||||
'-l[List all packages in a repository]'
|
'-l[List all packages in a repository]'
|
||||||
|
|
|
@ -245,10 +245,6 @@ Sync Options[[SO]]
|
||||||
from the cache. In both cases, you will have a yes or no option to
|
from the cache. In both cases, you will have a yes or no option to
|
||||||
remove packages and/or unused downloaded databases.
|
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*::
|
*-g, \--groups*::
|
||||||
Display all the members for each package group specified. If no group
|
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
|
names are provided, all groups will be listed; pass the flag twice to
|
||||||
|
|
|
@ -271,7 +271,7 @@ typedef enum _pmtransflag_t {
|
||||||
PM_TRANS_FLAG_CASCADE = 0x10,
|
PM_TRANS_FLAG_CASCADE = 0x10,
|
||||||
PM_TRANS_FLAG_RECURSE = 0x20,
|
PM_TRANS_FLAG_RECURSE = 0x20,
|
||||||
PM_TRANS_FLAG_DBONLY = 0x40,
|
PM_TRANS_FLAG_DBONLY = 0x40,
|
||||||
PM_TRANS_FLAG_DEPENDSONLY = 0x80,
|
/* 0x80 flag can go here */
|
||||||
PM_TRANS_FLAG_ALLDEPS = 0x100,
|
PM_TRANS_FLAG_ALLDEPS = 0x100,
|
||||||
PM_TRANS_FLAG_DOWNLOADONLY = 0x200,
|
PM_TRANS_FLAG_DOWNLOADONLY = 0x200,
|
||||||
PM_TRANS_FLAG_NOSCRIPTLET = 0x400,
|
PM_TRANS_FLAG_NOSCRIPTLET = 0x400,
|
||||||
|
|
|
@ -393,12 +393,10 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync
|
||||||
*data = NULL;
|
*data = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!(trans->flags & PM_TRANS_FLAG_DEPENDSONLY)) {
|
|
||||||
for(i = trans->packages; i; i = i->next) {
|
for(i = trans->packages; i; i = i->next) {
|
||||||
pmsyncpkg_t *sync = i->data;
|
pmsyncpkg_t *sync = i->data;
|
||||||
list = alpm_list_add(list, sync->pkg);
|
list = alpm_list_add(list, sync->pkg);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if(!(trans->flags & PM_TRANS_FLAG_NODEPS)) {
|
if(!(trans->flags & PM_TRANS_FLAG_NODEPS)) {
|
||||||
/* Resolve targets dependencies */
|
/* Resolve targets dependencies */
|
||||||
|
@ -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) {
|
for(i = list; i; i = i->next) {
|
||||||
/* add the dependencies found by resolvedeps to the transaction set */
|
/* add the dependencies found by resolvedeps to the transaction set */
|
||||||
pmpkg_t *spkg = i->data;
|
pmpkg_t *spkg = i->data;
|
||||||
|
|
|
@ -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")
|
|
|
@ -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")
|
|
|
@ -52,7 +52,6 @@ typedef struct __config_t {
|
||||||
unsigned short op_q_upgrade;
|
unsigned short op_q_upgrade;
|
||||||
|
|
||||||
unsigned short op_s_clean;
|
unsigned short op_s_clean;
|
||||||
unsigned short op_s_dependsonly;
|
|
||||||
unsigned short op_s_downloadonly;
|
unsigned short op_s_downloadonly;
|
||||||
unsigned short op_s_info;
|
unsigned short op_s_info;
|
||||||
unsigned short op_s_sync;
|
unsigned short op_s_sync;
|
||||||
|
|
|
@ -114,7 +114,6 @@ static void usage(int op, const char * const myname)
|
||||||
printf(_(" --asexplicit install packages as explicitly installed\n"));
|
printf(_(" --asexplicit install packages as explicitly installed\n"));
|
||||||
printf(_(" -c, --clean remove old packages from cache directory (-cc for all)\n"));
|
printf(_(" -c, --clean remove old packages from cache directory (-cc for all)\n"));
|
||||||
printf(_(" -d, --nodeps skip dependency checks\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(_(" -f, --force force install, overwrite conflicting files\n"));
|
||||||
printf(_(" -g, --groups view all members of a package group\n"));
|
printf(_(" -g, --groups view all members of a package group\n"));
|
||||||
printf(_(" -i, --info view package information\n"));
|
printf(_(" -i, --info view package information\n"));
|
||||||
|
@ -314,7 +313,6 @@ static int parseargs(int argc, char *argv[])
|
||||||
{"clean", no_argument, 0, 'c'},
|
{"clean", no_argument, 0, 'c'},
|
||||||
{"nodeps", no_argument, 0, 'd'},
|
{"nodeps", no_argument, 0, 'd'},
|
||||||
{"deps", no_argument, 0, 'd'},
|
{"deps", no_argument, 0, 'd'},
|
||||||
{"dependsonly",no_argument, 0, 'e'},
|
|
||||||
{"explicit", no_argument, 0, 'e'},
|
{"explicit", no_argument, 0, 'e'},
|
||||||
{"force", no_argument, 0, 'f'},
|
{"force", no_argument, 0, 'f'},
|
||||||
{"groups", no_argument, 0, 'g'},
|
{"groups", no_argument, 0, 'g'},
|
||||||
|
@ -444,7 +442,6 @@ static int parseargs(int argc, char *argv[])
|
||||||
break;
|
break;
|
||||||
case 'e':
|
case 'e':
|
||||||
config->op_q_explicit = 1;
|
config->op_q_explicit = 1;
|
||||||
config->flags |= PM_TRANS_FLAG_DEPENDSONLY;
|
|
||||||
break;
|
break;
|
||||||
case 'f': config->flags |= PM_TRANS_FLAG_FORCE; break;
|
case 'f': config->flags |= PM_TRANS_FLAG_FORCE; break;
|
||||||
case 'g': (config->group)++; break;
|
case 'g': (config->group)++; break;
|
||||||
|
|
Loading…
Add table
Reference in a new issue