moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-12-22 15:58:50 -05:00
Code Issues Releases Wiki Activity

Revert "Enable recursive/needed sync on SyncFirst"

Browse Source 
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:
Dan McGee 2012-02-15 15:16:23 -06:00
parent edd81f3e8b
commit 9a1ff474f1
4 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pacman/sync.c
View File

@ -963,8 +963,6 @@ int pacman_sync(alpm_list_t *targets)
FREELIST(targs); FREELIST(targs);
targs = packages; targs = packages;
config->flags = 0; config->flags = 0;
config->flags |= ALPM_TRANS_FLAG_RECURSE;
config->flags |= ALPM_TRANS_FLAG_NEEDED;
config->op_s_upgrade = 0; config->op_s_upgrade = 0;
} else { } else {
FREELIST(packages); FREELIST(packages);

8
test/pacman/tests/sync302.py
View File

@ -38,12 +38,12 @@ self.option["SyncFirst"] = ["pacman"]
self.args = "-Su" self.args = "-Su"
self.addrule("PACMAN_RETCODE=0") self.addrule("PACMAN_RETCODE=0")
self.addrule("PKG_EXIST=pacman")
self.addrule("PKG_VERSION=pacman|1.0-2") self.addrule("PKG_VERSION=pacman|1.0-2")
self.addrule("PKG_EXIST=glibc") self.addrule("PKG_EXIST=glibc")
self.addrule("PKG_VERSION=glibc|2.15-1")
self.addrule("PKG_EXIST=curl") self.addrule("PKG_EXIST=curl")
self.addrule("PKG_VERSION=curl|7.22-1")
self.addrule("PKG_EXIST=libarchive") 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") self.addrule("PKG_EXIST=zlib")

3
test/pacman/tests/sync303.py
View File

@ -29,10 +29,7 @@ self.option["SyncFirst"] = ["pacman"]
self.args = "-Su" self.args = "-Su"
self.addrule("PACMAN_RETCODE=0") self.addrule("PACMAN_RETCODE=0")
self.addrule("PKG_EXIST=pacman")
self.addrule("PKG_VERSION=pacman|1.0-2") self.addrule("PKG_VERSION=pacman|1.0-2")
self.addrule("PKG_EXIST=glibc-awesome") self.addrule("PKG_EXIST=glibc-awesome")
self.addrule("PKG_VERSION=glibc-awesome|2.13-2") self.addrule("PKG_VERSION=glibc-awesome|2.13-2")
self.addrule("PKG_EXIST=zlib") self.addrule("PKG_EXIST=zlib")
self.expectfailure = True

3
test/pacman/tests/sync305.py
View File

@ -61,7 +61,4 @@ self.option["SyncFirst"] = ["pacman"]
self.args = "-Su" self.args = "-Su"
self.addrule("PACMAN_RETCODE=0") self.addrule("PACMAN_RETCODE=0")
self.addrule("PKG_EXIST=pacman")
self.addrule("PKG_VERSION=pacman|4.0.1-2") self.addrule("PKG_VERSION=pacman|4.0.1-2")
self.expectfailure = True