Permalink
Browse files

ignore -S and -Q options for -p.

This is a little odd, but since -p has no meaning for -S, this is (for
now) safe.
  • Loading branch information...
1 parent 47fd570 commit 261c9a958100e9a9aeda5d976788199ddbe182a2 @falconindy committed Oct 29, 2011
Showing with 20 additions and 23 deletions.
  1. +1 −2 README.pod
  2. +19 −21 expac.c
View
@@ -54,8 +54,7 @@ sequence specified with a capital letter. The default value is two spaces.
=item B<-p, --file>
-Interpret targets as paths to local files. This option only makes sense with the
--Q option.
+Interpret targets as paths to local files.
=item B<-t, --timefmt> <format>
View
40 expac.c
@@ -597,33 +597,31 @@ int main(int argc, char *argv[]) {
}
/* ensure sane defaults */
- if (!dblist) {
- if (localpkg) {
- /* load each target as a package */
- for (i = targets; i; i = alpm_list_next(i)) {
- alpm_pkg_t *pkg;
- int err;
-
- err = alpm_pkg_load(handle, i->data, 0,
- ALPM_SIG_PACKAGE|ALPM_SIG_PACKAGE_OPTIONAL, &pkg);
- if (err) {
- fprintf(stderr, "error: %s: %s\n", (const char*)i->data,
- alpm_strerror(alpm_errno(handle)));
- continue;
- }
- results = alpm_list_add(results, pkg);
- }
- } else {
- local = true;
- dblist = alpm_list_add(dblist, db_local);
- }
+ if (!dblist && !localpkg) {
+ local = true;
+ dblist = alpm_list_add(dblist, db_local);
}
delim = delim ? delim : DEFAULT_DELIM;
listdelim = listdelim ? listdelim : DEFAULT_LISTDELIM;
timefmt = timefmt ? timefmt : DEFAULT_TIMEFMT;
- if (!localpkg) {
+ if (localpkg) {
+ /* load each target as a package */
+ for (i = targets; i; i = alpm_list_next(i)) {
+ alpm_pkg_t *pkg;
+ int err;
+
+ err = alpm_pkg_load(handle, i->data, 0,
+ ALPM_SIG_PACKAGE|ALPM_SIG_PACKAGE_OPTIONAL, &pkg);
+ if (err) {
+ fprintf(stderr, "error: %s: %s\n", (const char*)i->data,
+ alpm_strerror(alpm_errno(handle)));
+ continue;
+ }
+ results = alpm_list_add(results, pkg);
+ }
+ } else {
results = resolve_pkg(targets);
if (!results) {
ret = 1;

0 comments on commit 261c9a9

Please sign in to comment.