diff options
| author | Dan McGee <dan@archlinux.org> | 2010-06-20 15:15:05 -0500 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2010-06-20 15:19:19 -0500 |
| commit | 6c00ca8f234cfcbfde7e36b68d85f9dcab5716c8 (patch) | |
| tree | a7eaee9848e37456c2da93b68da74868af48c601 | |
| parent | 7fc50d79508f30e74e5ea8d9c801549e7f52229d (diff) | |
| download | pacman-6c00ca8f234cfcbfde7e36b68d85f9dcab5716c8.tar.xz | |
Handle sync target + ignore properly
Rather than say we can't find the target after saying "No, I guess I don't
want to install this", we should make sure the ignored status gets passed
all the way through. This fixes FS#19866.
Pactest is also included that failed before due to the fact that we normally
treat an unfound package as a reason to exit with a non-zero status.
Signed-off-by: Dan McGee <dan@archlinux.org>
| -rw-r--r-- | lib/libalpm/sync.c | 6 | ||||
| -rw-r--r-- | test/pacman/tests/ignore006.py | 10 |
2 files changed, 15 insertions, 1 deletions
diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 67afd397..68ee8dc7 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -291,7 +291,11 @@ int _alpm_sync_target(alpm_list_t *dbs_sync, char *target) } if(!found) { - RET_ERR(PM_ERR_PKG_NOT_FOUND, -1); + /* pass through any 'found but ignored' errors */ + if(pm_errno != PM_ERR_PKG_IGNORED) { + pm_errno = PM_ERR_PKG_NOT_FOUND; + } + return(-1); } return(0); diff --git a/test/pacman/tests/ignore006.py b/test/pacman/tests/ignore006.py new file mode 100644 index 00000000..4c1c1cac --- /dev/null +++ b/test/pacman/tests/ignore006.py @@ -0,0 +1,10 @@ +self.description = "Sync with target in ignore list and say no" + +pkg = pmpkg("package1") +self.addpkg2db("sync", pkg) + +self.option["IgnorePkg"] = ["package1"] +self.args = "--ask=1 -S %s" % pkg.name + +self.addrule("PACMAN_RETCODE=0") +self.addrule("!PKG_EXIST=package1") |