diff options
| author | Dan McGee <dan@archlinux.org> | 2012-02-15 15:16:23 -0600 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2012-02-15 15:56:16 -0600 |
| commit | 9a1ff474f1fe03e8bfdaf81ffc9a4881a44baea9 (patch) | |
| tree | a7502d6a51ac632e738979d75747eb496e70fa9d | |
| parent | edd81f3e8b505be2f7c7a18d3c28956b82264c45 (diff) | |
| download | pacman-9a1ff474f1fe03e8bfdaf81ffc9a4881a44baea9.tar.xz | |
Revert "Enable recursive/needed sync on SyncFirst"
This reverts commit 09034520325efcc2e684f05fa7a99c02bad1f5be.
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>
| -rw-r--r-- | src/pacman/sync.c | 2 | ||||
| -rw-r--r-- | test/pacman/tests/sync302.py | 8 | ||||
| -rw-r--r-- | test/pacman/tests/sync303.py | 3 | ||||
| -rw-r--r-- | test/pacman/tests/sync305.py | 3 |
4 files changed, 4 insertions, 12 deletions
diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 4f10e6b9..fcc887ae 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -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); diff --git a/test/pacman/tests/sync302.py b/test/pacman/tests/sync302.py index b44aaed4..78e45c33 100644 --- a/test/pacman/tests/sync302.py +++ b/test/pacman/tests/sync302.py @@ -38,12 +38,12 @@ self.option["SyncFirst"] = ["pacman"] 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") diff --git a/test/pacman/tests/sync303.py b/test/pacman/tests/sync303.py index b717dd2c..9d7bab58 100644 --- a/test/pacman/tests/sync303.py +++ b/test/pacman/tests/sync303.py @@ -29,10 +29,7 @@ self.option["SyncFirst"] = ["pacman"] 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 diff --git a/test/pacman/tests/sync305.py b/test/pacman/tests/sync305.py index 24fcee48..62005b58 100644 --- a/test/pacman/tests/sync305.py +++ b/test/pacman/tests/sync305.py @@ -61,7 +61,4 @@ self.option["SyncFirst"] = ["pacman"] 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 |