diff options
author | Dan McGee <dan@archlinux.org> | 2012-02-21 00:00:26 +0100 |
---|---|---|
committer | Dan McGee <dan@archlinux.org> | 2012-02-21 00:00:26 +0100 |
commit | 3849c3aec130601572b9e06b42bb6af5938936de (patch) | |
tree | f298f227f4ff591390e55b4f02812f12312dd5c7 /test/pacman/tests/sync302.py | |
parent | 326c6a8eed60bfd6aa0d653dad722d8637022d68 (diff) | |
parent | 78adb71f20ee335dff49e34d33f04817a40002b6 (diff) | |
download | pacman-3849c3aec130601572b9e06b42bb6af5938936de.tar.gz pacman-3849c3aec130601572b9e06b42bb6af5938936de.tar.xz |
Merge branch 'maint'
Conflicts:
contrib/pacsysclean.in
src/pacman/conf.h
Diffstat (limited to 'test/pacman/tests/sync302.py')
-rw-r--r-- | test/pacman/tests/sync302.py | 8 |
1 files changed, 4 insertions, 4 deletions
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") |