Revert "Enable recursive/needed sync on SyncFirst"
This reverts commit 0903452032
.
Tests affected by this revert have been adjusted; additionally a few
EXIST tests have been removed where there is already a VERSION test
doing the job for us.
Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
parent
edd81f3e8b
commit
9a1ff474f1
|
@ -963,8 +963,6 @@ int pacman_sync(alpm_list_t *targets)
|
|||
FREELIST(targs);
|
||||
targs = packages;
|
||||
config->flags = 0;
|
||||
config->flags |= ALPM_TRANS_FLAG_RECURSE;
|
||||
config->flags |= ALPM_TRANS_FLAG_NEEDED;
|
||||
config->op_s_upgrade = 0;
|
||||
} else {
|
||||
FREELIST(packages);
|
||||
|
|
|
@ -38,12 +38,12 @@
|
|||
self.args = "-Su"
|
||||
|
||||
self.addrule("PACMAN_RETCODE=0")
|
||||
self.addrule("PKG_EXIST=pacman")
|
||||
self.addrule("PKG_VERSION=pacman|1.0-2")
|
||||
self.addrule("PKG_EXIST=glibc")
|
||||
self.addrule("PKG_VERSION=glibc|2.15-1")
|
||||
self.addrule("PKG_EXIST=curl")
|
||||
self.addrule("PKG_VERSION=curl|7.22-1")
|
||||
self.addrule("PKG_EXIST=libarchive")
|
||||
self.addrule("PKG_VERSION=libarchive|2.8.5-1")
|
||||
# TODO: when SyncFirst recursive comes back, re-enable these
|
||||
#self.addrule("PKG_VERSION=glibc|2.15-1")
|
||||
#self.addrule("PKG_VERSION=curl|7.22-1")
|
||||
#self.addrule("PKG_VERSION=libarchive|2.8.5-1")
|
||||
self.addrule("PKG_EXIST=zlib")
|
||||
|
|
|
@ -29,10 +29,7 @@
|
|||
self.args = "-Su"
|
||||
|
||||
self.addrule("PACMAN_RETCODE=0")
|
||||
self.addrule("PKG_EXIST=pacman")
|
||||
self.addrule("PKG_VERSION=pacman|1.0-2")
|
||||
self.addrule("PKG_EXIST=glibc-awesome")
|
||||
self.addrule("PKG_VERSION=glibc-awesome|2.13-2")
|
||||
self.addrule("PKG_EXIST=zlib")
|
||||
|
||||
self.expectfailure = True
|
||||
|
|
|
@ -61,7 +61,4 @@
|
|||
|
||||
self.args = "-Su"
|
||||
self.addrule("PACMAN_RETCODE=0")
|
||||
self.addrule("PKG_EXIST=pacman")
|
||||
self.addrule("PKG_VERSION=pacman|4.0.1-2")
|
||||
|
||||
self.expectfailure = True
|
||||
|
|
Loading…
Reference in New Issue