- Pacman-dev - lists.archlinux.org

[pacman-dev] more universal testdb -- bugs in our sync repos
by Nagy Gabor 30 Nov '07

30 Nov '07

Hi! Imho that would be helpful if testdb were more flexible. This may not be the proper ML (but I'm sure that reporting bugs is better than being silent), but I made some tests on sync repos, and I found the following inconsistencies in our sync dbs, mostly in community (I have only core, extra, community "enabled"): Unsatisfied dependencies: ------------------------- firefox-i18n -> firefox-i18n=2.0.0.9 dfm -> xfree86 fvwm-themes-devel -> fvwm-devel icomplete -> vim-devel perl-xml-feed -> perl-datetime-format-mail -> perl-datetime>=0.1705 perl-xml-rss -> perl-datetime-format-mail -> perl-datetime>=0.1705 perl-datetime-format-strptime -> perl-datetime>=0.1402 portaudio_cpp -> portaudio Strange dependency (cycle): --------------------------- archboot->archboot Some of them (like firefox-i18n) is not actual yet, but these things could be tested by a clever app (a modified testdb for internal use) to avoid these bugs. Bye, ngaba ---------------------------------------------------- SZTE Egyetemi Könyvtár - http://www.bibl.u-szeged.hu This mail sent through IMP: http://horde.org/imp/

2 2

[pacman-dev] [PATCH] New sync1005.py pactest
by Nagy Gabor 30 Nov '07

30 Nov '07

Hi! Patch attached. Note: I found an issue in resolvedeps, it simply pulls both pkg1s with this pactest (debug log), but the pactest doesn't fail [I don't know why]: ---sync1006.py--- self.description = "Conflicting package names in sync repos (2)" sp1 = pmpkg("pkg1") sp1.provides = [ "provision1" ] self.addpkg2db("sync1", sp1) sp2 = pmpkg("pkg1") sp2.provides = ["provision2"] self.addpkg2db("sync2", sp2) sp3 = pmpkg("pkg2") sp3.depends = ["provision1", "provision2"] self.addpkg2db("sync1", sp3) self.args = "-S pkg2" self.addrule("PACMAN_RETCODE=1") self.addrule("!PKG_EXIST=pkg1") self.addrule("!PKG_EXIST=pkg2") ---------------------------------------------------- SZTE Egyetemi Könyvtár - http://www.bibl.u-szeged.hu This mail sent through IMP: http://horde.org/imp/

2 2

[pacman-dev] Fast binary database
by Sivert Berg 29 Nov '07

29 Nov '07

Hello, I have been playing with the idea of speeding up pacman for a little while. This is my first try. It's a binary database that uses a ternary search tree to speedup file lookup and package lookup. The result can be found at http://owwsnap.com/sarcina-0.0.1.tar.gz. To compile it you need to run the normal ./configure && make, but you would probably want to edit src/sarcina.c and change the hardcoded paths. If you're running a new version of pacman (3.1 or something) you probably need to change libsarc/sarc.c:505: db_local = alpm_db_register("local"); into alpm_option_set_dbpath("/var/lib/pacman/"); db_local = alpm_db_register_local(); I see you have discussed the database question several times. I hope this code could give you some answers (is a binary database really faster etc). To run this program you first need to build the database using sarcina -u. Then you can: - find who owns a file (sarcina -o file) - list files that are outdated (sarcina -s) - "install" a package (sarcina -i package). This is pretty much just a proof-of-concept, so don't expect it to do much, but I think it might be a start. Sivert

4 3

[pacman-dev] Bug with rxvt-unicode version check
by bardo 28 Nov '07

28 Nov '07

Hi all. I'm experiencing a strange problem: rxvt-unicode should be upgraded from 8.4-1 to 8.5a-1, but when it comes the time of checking if the package has been cached, 8.4-1 is marked as a match, and gets installed instead of the new version. I can reproduce this whenever I want, since pacman tries to upgrade rxvt-unicode with every -Su. The relevant part of pacman -Syu --debug is attached, I can upload the whole log if needed (~750KB). Corrado

5 10

[pacman-dev] [PATCH] Optimize string comparison on 1 character compare
by Dan McGee 27 Nov '07

27 Nov '07

No need to do strcmp when we can check for direct equality, but is it worth the optimization? Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/be_files.c | 4 ++-- lib/libalpm/util.c | 2 +- src/pacman/sync.c | 4 ++-- src/pacman/util.c | 2 +- src/util/testdb.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/libalpm/be_files.c b/lib/libalpm/be_files.c index 078136e..74932d2 100644 --- a/lib/libalpm/be_files.c +++ b/lib/libalpm/be_files.c @@ -170,7 +170,7 @@ pmpkg_t *_alpm_db_scan(pmdb_t *db, const char *target) /* search for a specific package (by name only) */ rewinddir(db->handle); while(!found && (ent = readdir(db->handle)) != NULL) { - if(!strcmp(ent->d_name, ".") || !strcmp(ent->d_name, "..")) { + if(*(ent->d_name) == '.' || !strcmp(ent->d_name, "..")) { continue; } /* stat the entry, make sure it's a directory */ @@ -201,7 +201,7 @@ pmpkg_t *_alpm_db_scan(pmdb_t *db, const char *target) if(ent == NULL) { return(NULL); } - if(!strcmp(ent->d_name, ".") || !strcmp(ent->d_name, "..")) { + if(*(ent->d_name) == '.' || !strcmp(ent->d_name, "..")) { isdir = 0; continue; } diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 2a42948..3ce1f04 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -463,7 +463,7 @@ int _alpm_rmrf(const char *path) for(dp = readdir(dirp); dp != NULL; dp = readdir(dirp)) { if(dp->d_ino) { sprintf(name, "%s/%s", path, dp->d_name); - if(strcmp(dp->d_name, "..") && strcmp(dp->d_name, ".")) { + if(strcmp(dp->d_name, "..") && *(dp->d_name) != '.') { errflag += _alpm_rmrf(name); } } diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 58e616e..e9c16f5 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -61,7 +61,7 @@ static int sync_cleandb(const char *dbpath) { int found = 0; char *dname = ent->d_name; - if(!strcmp(dname, ".") || !strcmp(dname, "..")) { + if(*dname == '.' || !strcmp(dname, "..")) { continue; } /* skip the local and sync directories */ @@ -145,7 +145,7 @@ static int sync_cleancache(int level) char path[PATH_MAX]; pmpkg_t *localpkg = NULL, *dbpkg = NULL; - if(!strcmp(ent->d_name, ".") || !strcmp(ent->d_name, "..")) { + if(*(ent->d_name) == '.' || !strcmp(ent->d_name, "..")) { continue; } /* build the full filepath */ diff --git a/src/pacman/util.c b/src/pacman/util.c index a925be3..5025b3f 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -154,7 +154,7 @@ int rmrf(const char *path) if(dp->d_ino) { char name[PATH_MAX]; sprintf(name, "%s/%s", path, dp->d_name); - if(strcmp(dp->d_name, "..") && strcmp(dp->d_name, ".")) { + if(strcmp(dp->d_name, "..") && *(dp->d_name) != '.') { errflag += rmrf(name); } } diff --git a/src/util/testdb.c b/src/util/testdb.c index 31b4ff0..c3f86d8 100644 --- a/src/util/testdb.c +++ b/src/util/testdb.c @@ -75,7 +75,7 @@ static int db_test(char *dbpath) } while ((ent = readdir(dir)) != NULL) { - if(!strcmp(ent->d_name, ".") || !strcmp(ent->d_name, "..")) { + if(*(ent->d_name) == '.' || !strcmp(ent->d_name, "..")) { continue; } /* check for desc, depends, and files */ -- 1.5.3.6

3 3

[pacman-dev] [PATCH] Unify dump_pkg_full in pacman [-Si, -Qip, -Qi and -Qii]
by Nagy Gabor 27 Nov '07

27 Nov '07

Patch attached. Notes: 1. 'Compressed size' is ugly [too long, no space before :], improvements welcome 2. The following commit is misleading in case of sync packages (isize == 0 means isize is not filled in, not isize == csize): http://projects.archlinux.org/git/? p=pacman.git;a=commit;h=5e12d3dec99e7a506683cf625fa4344f57df0b77 Bye ---------------------------------------------------- SZTE Egyetemi Könyvtár - http://www.bibl.u-szeged.hu This mail sent through IMP: http://horde.org/imp/

2 2

[pacman-dev] [PATCH] Fix several memleaks, mostly related to errors handling.
by Chantry Xavier 26 Nov '07

26 Nov '07

* The frontend calls alpm_trans_prepare(&data), and in case of errors, receive the missing dependencies / conflicts / etc in the data pointer. It apparently needs to free this structure totally with : alpm_list_free_inner(data, free) alpm_list_free(data) So I added alpm_list_free_inner(data, free) in pacman/{sync.c,remove.c,add,c} * in _alpm_sync_prepare, the deps and asked lists were not freed in case of errors (unresolvable conflicts). Besides the code for handling this case was duplicated. * in _alpm_remove_commit, free was used instead of alpm_list_free for newfiles. * newline fix in pacman/sync.c Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> --- lib/libalpm/remove.c | 2 +- lib/libalpm/sync.c | 42 ++++++++++++++++++------------------------ src/pacman/add.c | 1 + src/pacman/remove.c | 1 + src/pacman/sync.c | 3 ++- 5 files changed, 23 insertions(+), 26 deletions(-) diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 592cf39..e1f19ec 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -315,7 +315,7 @@ int _alpm_remove_commit(pmtrans_t *trans, pmdb_t *db) (pkg_count - alpm_list_count(targ) + 1)); position++; } - free(newfiles); + alpm_list_free(newfiles); } /* set progress to 100% after we finish unlinking files */ diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index f03a78b..b49bbfb 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -496,12 +496,13 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync if(deps) { int errorout = 0; alpm_list_t *asked = NULL; + pmconflict_t *conflict = NULL; for(i = deps; i && !errorout; i = i->next) { - pmconflict_t *conflict = i->data; pmsyncpkg_t *sync; pmpkg_t *found = NULL; + conflict = i->data; _alpm_log(PM_LOG_DEBUG, "package '%s' conflicts with '%s'\n", conflict->package1, conflict->package2); /* check if the conflicting package is about to be removed/replaced. @@ -614,42 +615,35 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync /* abort */ _alpm_log(PM_LOG_ERROR, _("unresolvable package conflicts detected\n")); errorout = 1; - if(data) { - if((conflict = malloc(sizeof(pmconflict_t))) == NULL) { - _alpm_log(PM_LOG_ERROR, _("malloc failure: could not allocate %zd bytes\n"), sizeof(pmconflict_t)); - FREELIST(*data); - pm_errno = PM_ERR_MEMORY; - ret = -1; - goto cleanup; - } - *conflict = *(pmconflict_t *)i->data; - *data = alpm_list_add(*data, conflict); - } } } } else { _alpm_log(PM_LOG_ERROR, _("unresolvable package conflicts detected\n")); errorout = 1; - if(data) { - if((conflict = malloc(sizeof(pmconflict_t))) == NULL) { - _alpm_log(PM_LOG_ERROR, _("malloc failure: could not allocate %zd bytes\n"), sizeof(pmconflict_t)); - FREELIST(*data); - pm_errno = PM_ERR_MEMORY; - ret = -1; - goto cleanup; - } - *conflict = *(pmconflict_t *)i->data; - *data = alpm_list_add(*data, conflict); - } } } if(errorout) { + /* The last conflict was unresolvable, so we duplicate it and add it to *data */ pm_errno = PM_ERR_CONFLICTING_DEPS; + if(data) { + pmconflict_t *lastconflict = conflict; + if((conflict = malloc(sizeof(pmconflict_t))) == NULL) { + _alpm_log(PM_LOG_ERROR, _("malloc failure: could not allocate %zd bytes\n"), + sizeof(pmconflict_t)); + FREELIST(*data); + pm_errno = PM_ERR_MEMORY; + } else { + *conflict = *lastconflict; + *data = alpm_list_add(*data, conflict); + } + } + FREELIST(asked); + FREELIST(deps); ret = -1; goto cleanup; } - FREELIST(deps); FREELIST(asked); + FREELIST(deps); } EVENT(trans, PM_TRANS_EVT_INTERCONFLICTS_DONE, NULL, NULL); } diff --git a/src/pacman/add.c b/src/pacman/add.c index 7d18749..e04707f 100644 --- a/src/pacman/add.c +++ b/src/pacman/add.c @@ -175,6 +175,7 @@ int pacman_add(alpm_list_t *targets) break; } add_cleanup(); + alpm_list_free_inner(data, free); alpm_list_free(data); return(1); } diff --git a/src/pacman/remove.c b/src/pacman/remove.c index e1e4f04..1028d9e 100644 --- a/src/pacman/remove.c +++ b/src/pacman/remove.c @@ -133,6 +133,7 @@ int pacman_remove(alpm_list_t *targets) depstring); free(depstring); } + alpm_list_free_inner(data, free); alpm_list_free(data); break; default: diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 41d18a9..889c682 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -621,7 +621,7 @@ int sync_trans(alpm_list_t *targets, int sync_only) case PM_ERR_CONFLICTING_DEPS: for(i = data; i; i = alpm_list_next(i)) { pmconflict_t *conflict = alpm_list_getdata(i); - printf(_(":: %s: conflicts with %s"), + printf(_(":: %s: conflicts with %s\n"), alpm_conflict_get_package1(conflict), alpm_conflict_get_package2(conflict)); } break; @@ -706,6 +706,7 @@ int sync_trans(alpm_list_t *targets, int sync_only) /* Step 4: release transaction resources */ cleanup: if(data) { + alpm_list_free_inner(data, free); alpm_list_free(data); } if(alpm_trans_release() == -1) { -- 1.5.3.6

5 9

[pacman-dev] [PATCH] pacman/query.c : -Qo optimization.
by Chantry Xavier 26 Nov '07

26 Nov '07

I didn't understand why realpath was called on every files of every filelist in query_fileowner : ppath = resolve_path(path); It turns out this is needed for the diverted files. For example, cddb_get installs /usr/lib/perl5/site_perl/5.8.8/CDDB_get.pm which actually ends in /usr/lib/perl5/site_perl/current/CDDB_get.pm . And for making pacman -Qo /usr/lib/perl5/site_perl/current/CDDB_get.pm , realpath has to be called on both the target, and the file in the filelist. However, realpath is costly, and calling it on every single file resulted in a poor -Qo performance. Worst case : pacman -Qo /lib/libz.so.1 0.35s user 1.51s system 99% cpu 1.864 total So I did a little optimization to avoid calling realpath as much as possible: first compare the basename of each file. Result: src/pacman/pacman -Qo /lib/libz.so.1 0.24s user 0.05s system 99% cpu 0.298 total Obviously, the difference will be even bigger at the first run (no fs cache), though it's quite scary on my system : 1.7s vs 40s previously. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> --- src/pacman/query.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/src/pacman/query.c b/src/pacman/query.c index bb69527..7989756 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -71,6 +71,7 @@ static int query_fileowner(alpm_list_t *targets) for(t = targets; t; t = alpm_list_next(t)) { int found = 0; char *filename = alpm_list_getdata(t); + char *bname; char *rpath; struct stat buf; alpm_list_t *i, *j; @@ -88,6 +89,8 @@ static int query_fileowner(alpm_list_t *targets) continue; } + bname = basename(filename); + if(!(rpath = resolve_path(filename))) { fprintf(stderr, _("error: cannot determine real path for '%s': %s\n"), filename, strerror(errno)); @@ -103,6 +106,11 @@ static int query_fileowner(alpm_list_t *targets) snprintf(path, PATH_MAX, "%s%s", alpm_option_get_root(), (const char *)alpm_list_getdata(j)); + /* avoid the costly resolve_path usage if the basenames don't match */ + if(strcmp(basename(path), bname) != 0) { + continue; + } + ppath = resolve_path(path); if(ppath && strcmp(ppath, rpath) == 0) { -- 1.5.3.6

5 10

[pacman-dev] [PATCH] Allow -c,--conf option for ABS
by Scott Horowitz 26 Nov '07

26 Nov '07

In creating my python arch integrity script, which looks for various issues in pkgbuilds and repos, I found it would be useful to be able to have both an abs.conf and an abs64.conf that I can call abs directly with. Right now I have to keep (un)commenting lines each time I want to update the abs tree for each arch, which is a pain. So here's a patch that allows the user to pass -c or --conf. I have no idea if I used git correctly, but it gave me a patch. Scott

3 3

[pacman-dev] [PATCH] Add new -Sq / --needed option.
by Chantry Xavier 26 Nov '07

26 Nov '07

This patch is the result of the constatation than, during one pacman operation, the "local version is up to date. Upgrade anyway?" questions are usually all answered either by yes or by no. Yes when you want to reinstall all the targets. No when you only want to install the missing ones (either because you are installing a group, or because you are copying a pacman -S line from wiki or whatever). So instead of asking this question for every targets, it'll now be configured with a flag. Yes will be the default -S behavior, No will be achieved with the --needed flag. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> --- contrib/bash_completion | 2 ++ doc/pacman.8.txt | 3 +++ lib/libalpm/alpm.h | 5 +++-- lib/libalpm/sync.c | 17 ++++++++--------- src/pacman/callback.c | 11 ----------- src/pacman/pacman.c | 7 +++++-- 6 files changed, 21 insertions(+), 24 deletions(-) diff --git a/contrib/bash_completion b/contrib/bash_completion index 6aafc9e..c392217 100644 --- a/contrib/bash_completion +++ b/contrib/bash_completion @@ -170,6 +170,7 @@ _pacman () info) mod="${mod}i" ;; list) mod="${mod}l" ;; print-uris) mod="${mod}p" ;; + needed) mod="${mod}q" ;; search) mod="${mod}s" ;; sysupgrade) mod="${mod}u" ;; upgrades) mod="${mod}u" ;; @@ -268,6 +269,7 @@ _pacman () -i --info \ -l --list \ -p --print-uris \ + -q --needed \ -s --search \ -u --sysupgrade \ -w --downloadonly \ diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 7b10bc0..a8af743 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -243,6 +243,9 @@ Sync Options[[SO]] dependencies yet to be installed. These can be piped to a file and downloaded at a later time, using a program like wget. +*-q, \--needed*:: + Only install the targets that are not already installed and up-to-date. + *-s, \--search* <'regexp'>:: This will search each package in the sync databases for names or descriptions that match `regexp`. diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index b56f575..7b3b8b0 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -280,7 +280,8 @@ typedef enum _pmtransflag_t { PM_TRANS_FLAG_DOWNLOADONLY = 0x200, PM_TRANS_FLAG_NOSCRIPTLET = 0x400, PM_TRANS_FLAG_NOCONFLICTS = 0x800, - PM_TRANS_FLAG_PRINTURIS = 0x1000 + PM_TRANS_FLAG_PRINTURIS = 0x1000, + PM_TRANS_FLAG_NEEDED = 0x2000 } pmtransflag_t; /* Transaction Events */ @@ -321,7 +322,7 @@ typedef enum _pmtransconv_t { PM_TRANS_CONV_CONFLICT_PKG = 0x04, PM_TRANS_CONV_CORRUPTED_PKG = 0x08, PM_TRANS_CONV_LOCAL_NEWER = 0x10, - PM_TRANS_CONV_LOCAL_UPTODATE = 0x20, + /* 0x20 flag can go here */ PM_TRANS_CONV_REMOVE_HOLDPKG = 0x40 } pmtransconv_t; diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 16b1998..a3cd180 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -352,15 +352,14 @@ int _alpm_sync_addtarget(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sy local = _alpm_db_get_pkgfromcache(db_local, alpm_pkg_get_name(spkg)); if(local) { if(alpm_pkg_compare_versions(local, spkg) == 0) { - /* spkg is NOT an upgrade, get confirmation before adding */ - if(!(trans->flags & PM_TRANS_FLAG_PRINTURIS)) { - int resp = 0; - QUESTION(trans, PM_TRANS_CONV_LOCAL_UPTODATE, local, NULL, NULL, &resp); - if(!resp) { - _alpm_log(PM_LOG_WARNING, _("%s-%s is up to date -- skipping\n"), - alpm_pkg_get_name(local), alpm_pkg_get_version(local)); - return(0); - } + /* spkg is NOT an upgrade */ + if(trans->flags & PM_TRANS_FLAG_NEEDED) { + _alpm_log(PM_LOG_WARNING, _("%s-%s is up to date -- skipping\n"), + alpm_pkg_get_name(local), alpm_pkg_get_version(local)); + return(0); + } else { + _alpm_log(PM_LOG_WARNING, _("%s-%s is up to date -- reinstalling\n"), + alpm_pkg_get_name(local), alpm_pkg_get_version(local)); } } } diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 232ca4c..dd469ec 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -305,7 +305,6 @@ void cb_trans_conv(pmtransconv_t event, void *data1, void *data2, *response = yesno(str); break; case PM_TRANS_CONV_LOCAL_NEWER: - if(!config->op_s_downloadonly) { snprintf(str, LOG_STR_LEN, _(":: %s-%s: local version is newer. Upgrade anyway? [Y/n] "), alpm_pkg_get_name(data1), @@ -315,16 +314,6 @@ void cb_trans_conv(pmtransconv_t event, void *data1, void *data2, *response = 1; } break; - case PM_TRANS_CONV_LOCAL_UPTODATE: - if(!config->op_s_downloadonly) { - snprintf(str, LOG_STR_LEN, _(":: %s-%s: local version is up to date. Upgrade anyway? [Y/n] "), - alpm_pkg_get_name(data1), - alpm_pkg_get_version(data1)); - *response = yesno(str); - } else { - *response = 1; - } - break; case PM_TRANS_CONV_CORRUPTED_PKG: if(!config->noconfirm) { snprintf(str, LOG_STR_LEN, _(":: File %s is corrupted. Do you want to delete it? [Y/n] "), diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 31d31da..229fce3 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -129,6 +129,7 @@ static void usage(int op, const char * const myname) printf(_(" -i, --info view package information\n")); printf(_(" -l, --list <repo> view a list of packages in a repo\n")); printf(_(" -p, --print-uris print out URIs for given packages and their dependencies\n")); + printf(_(" -q, --needed only install outdated or not yet installed packages\n")); printf(_(" -s, --search <regex> search remote repositories for matching strings\n")); printf(_(" -u, --sysupgrade upgrade all packages that are out of date\n")); printf(_(" -w, --downloadonly download packages but do not install/upgrade anything\n")); @@ -287,11 +288,12 @@ static int parseargs(int argc, char *argv[]) {"info", no_argument, 0, 'i'}, {"dbonly", no_argument, 0, 'k'}, {"list", no_argument, 0, 'l'}, - {"nosave", no_argument, 0, 'n'}, {"foreign", no_argument, 0, 'm'}, + {"nosave", no_argument, 0, 'n'}, {"owns", no_argument, 0, 'o'}, {"file", no_argument, 0, 'p'}, {"print-uris", no_argument, 0, 'p'}, + {"needed", no_argument, 0, 'q'}, {"root", required_argument, 0, 'r'}, {"recursive", no_argument, 0, 's'}, {"search", no_argument, 0, 's'}, @@ -314,7 +316,7 @@ static int parseargs(int argc, char *argv[]) {0, 0, 0, 0} }; - while((opt = getopt_long(argc, argv, "ARUFQSTr:b:vkhscVfmnoldepituwygz", opts, &option_index))) { + while((opt = getopt_long(argc, argv, "ARUFQSTr:b:vkhscVfmnoldepqituwygz", opts, &option_index))) { alpm_list_t *list = NULL, *item = NULL; /* lists for splitting strings */ if(opt < 0) { @@ -431,6 +433,7 @@ static int parseargs(int argc, char *argv[]) config->op_q_isfile = 1; config->flags |= PM_TRANS_FLAG_PRINTURIS; break; + case 'q': config->flags |= PM_TRANS_FLAG_NEEDED; break; case 'r': if(alpm_option_set_root(optarg) != 0) { pm_printf(PM_LOG_ERROR, _("problem setting root '%s' (%s)\n"), -- 1.5.3.6

4 5