diff options
| author | Dan McGee <dan@archlinux.org> | 2011-08-26 01:37:23 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-08-29 02:37:04 +0200 |
| commit | 87fb8f5d5795be9b2bcb025eac26c94d7bb1e7b3 (patch) | |
| tree | d9e9e64eebe0391569db24022bdfa6829d5afb9b | |
| parent | 84d6de806bd18f4a6c0940de5ee60904f650539c (diff) | |
| download | pacman-87fb8f5d5795be9b2bcb025eac26c94d7bb1e7b3.tar.gz pacman-87fb8f5d5795be9b2bcb025eac26c94d7bb1e7b3.tar.xz | |
Make sync error message smarter on unfound targets
We had two issues here. One is a file with an absolute path passed to -S
results in a cryptic error message due to the database name being '\0'.
The second is not realizing you should be doing -U instead of -S. Fix
both of these to transform this:
$ sudo pacman -S /tmp/binutils-2.21.1-2-i686.pkg.tar.xz
error: database not found:
to this:
$ sudo pacman -S /tmp/binutils-2.21.1-2-i686.pkg.tar.xz
error: target not found: /tmp/binutils-2.21.1-2-i686.pkg.tar.xz
warning: '/tmp/binutils-2.21.1-2-i686.pkg.tar.xz' is a file, did you mean -U/--upgrade instead of -S/--sync?
Signed-off-by: Dan McGee <dan@archlinux.org>
| -rw-r--r-- | src/pacman/sync.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/pacman/sync.c b/src/pacman/sync.c index ea32a264..a7fe5be9 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -672,8 +672,6 @@ static int process_targname(alpm_list_t *dblist, const char *targname) /* #FS#23342 - skip ignored packages when user says no */ if(alpm_errno(config->handle) == ALPM_ERR_PKG_IGNORED) { pm_printf(ALPM_LOG_WARNING, _("skipping target: %s\n"), targname); - /* TODO how to do this, we shouldn't be fucking with it from the frontend */ - /* pm_errno = 0; */ return 0; } @@ -693,7 +691,7 @@ static int process_target(const char *target) int ret = 0; alpm_list_t *dblist = NULL; - if(targname) { + if(targname && targname != targstring) { alpm_db_t *db = NULL; *targname = '\0'; @@ -716,6 +714,11 @@ static int process_target(const char *target) } cleanup: free(targstring); + if(ret && access(target, R_OK) == 0) { + pm_fprintf(stderr, ALPM_LOG_WARNING, + _("'%s' is a file, did you mean %s instead of %s?"), + target, "-U/--upgrade", "-S/--sync"); + } return ret; } |