summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2010-12-30 09:41:46 -0600
committerDan McGee <dan@archlinux.org>2010-12-30 09:41:46 -0600
commit08d885fda5c9ccb3ac68faccc7c75e440ac71113 (patch)
tree3c494d8c593db3848d88a74b4e111710acfe0707 /test
parent351250adb49bea470b88fca54dcfba789b58545c (diff)
parent6ddc115c7f52d6d172ca3879f96cc782bb526313 (diff)
downloadpacman-08d885fda5c9ccb3ac68faccc7c75e440ac71113.tar.xz
Merge branch 'maint'
Conflicts: lib/libalpm/sync.c test/pacman/tests/ignore007.py
Diffstat (limited to 'test')
-rw-r--r--test/pacman/tests/ignore007.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/test/pacman/tests/ignore007.py b/test/pacman/tests/ignore007.py
index e4be40a1..bb5efdc9 100644
--- a/test/pacman/tests/ignore007.py
+++ b/test/pacman/tests/ignore007.py
@@ -19,5 +19,3 @@ self.addrule("PACMAN_RETCODE=0")
self.addrule("!PKG_EXIST=%s" % pkg1.name)
self.addrule("PKG_EXIST=%s" % pkg2.name)
self.addrule("PACMAN_OUTPUT=IgnorePkg")
-
-self.expectfailure = True