diff options
| author | Aaron Griffin <aaron@archlinux.org> | 2007-02-12 06:44:00 +0000 |
|---|---|---|
| committer | Aaron Griffin <aaron@archlinux.org> | 2007-02-12 06:44:00 +0000 |
| commit | be85600dfd68152a604bfe23f2e5a4285fa4f317 (patch) | |
| tree | 91693c1ed82a1000380cb033359a573245350913 | |
| parent | 2a7c1de945a3ad0673655ba65c1a2d0ade87c733 (diff) | |
| download | pacman-be85600dfd68152a604bfe23f2e5a4285fa4f317.tar.xz | |
* Removed the 'vercmp' op from pacman. The standalone 'vercmp' binary should be
used instead
* Allow -T/--deptest to work without root privileges
| -rw-r--r-- | src/pacman/conf.h | 1 | ||||
| -rw-r--r-- | src/pacman/deptest.c | 12 | ||||
| -rw-r--r-- | src/pacman/pacman.c | 6 |
3 files changed, 2 insertions, 17 deletions
diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 60e3661b..df04a22b 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -33,7 +33,6 @@ typedef struct __config_t { unsigned short upgrade; unsigned short noconfirm; unsigned short noprogressbar; - unsigned short op_d_vertest; unsigned short op_d_resolve; unsigned short op_q_isfile; unsigned short op_q_info; diff --git a/src/pacman/deptest.c b/src/pacman/deptest.c index c04ecb0c..04faeaa0 100644 --- a/src/pacman/deptest.c +++ b/src/pacman/deptest.c @@ -49,18 +49,6 @@ int pacman_deptest(alpm_list_t *targets) return(0); } - if(config->op_d_vertest) { - const char *pkga, *pkgb; - pkga = alpm_list_getdata(targets); - i = alpm_list_next(targets); - if(pkga && i && (pkgb = alpm_list_getdata(i))) { - int ret = alpm_pkg_vercmp(pkga, pkgb); - printf("%d\n", ret); - return(ret); - } - return(0); - } - /* we create a transaction to hold a dummy package to be able to use * deps checkings from alpm_trans_prepare() */ if(alpm_trans_init(PM_TRANS_TYPE_ADD, 0, NULL, NULL, NULL) == -1) { diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index bd48a895..3d62441e 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -183,7 +183,7 @@ static void cleanup(int signum) && (pm_errno == PM_ERR_TRANS_COMMITING)) { return; } - if(signum != 0 && config->op_d_vertest == 0) { + if(signum != 0) { /* TODO why is this here? */ fprintf(stderr, "\n"); } @@ -224,7 +224,6 @@ static int parseargs(int argc, char *argv[]) {"deptest", no_argument, 0, 'T'}, /* used by makepkg */ {"upgrade", no_argument, 0, 'U'}, {"version", no_argument, 0, 'V'}, - {"vertest", no_argument, 0, 'Y'}, /* does the same as the 'vercmp' binary */ {"dbpath", required_argument, 0, 'b'}, {"cascade", no_argument, 0, 'c'}, {"changelog", no_argument, 0, 'c'}, @@ -328,7 +327,6 @@ static int parseargs(int argc, char *argv[]) case 'V': config->version = 1; break; case 'Y': config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_DEPTEST); - config->op_d_vertest = 1; break; case 'b': if(stat(optarg, &st) == -1 || !S_ISDIR(st.st_mode)) { @@ -479,7 +477,7 @@ int main(int argc, char *argv[]) if((config->op == PM_OP_SYNC && !config->op_s_sync && (config->op_s_search || config->group || config->op_q_list || config->op_q_info || config->flags & PM_TRANS_FLAG_PRINTURIS)) - || (config->op == PM_OP_DEPTEST && !config->op_d_resolve) + || (config->op == PM_OP_DEPTEST && config->op_d_resolve) || (strcmp(alpm_option_get_root(), PM_ROOT) != 0)) { /* special case: PM_OP_SYNC can be used w/ config->op_s_search by any user */ /* special case: ignore root user check if -r is specified, fall back on |