summaryrefslogtreecommitdiffstats
path: root/test/pacman/pmrule.py
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2010-10-27 05:55:31 +0200
committerDan McGee <dan@archlinux.org>2011-01-22 18:19:21 +0100
commit32727efc38bf5376a402c4c4149cc4148ba2068b (patch)
treeebbe400b78b4431ca197ee9c49541178ac4dc066 /test/pacman/pmrule.py
parent5699f2c94c39afec19810fc450b78dced86e7c5d (diff)
downloadpacman-32727efc38bf5376a402c4c4149cc4148ba2068b.tar.gz
pacman-32727efc38bf5376a402c4c4149cc4148ba2068b.tar.xz
pactest: revamp modified logic
Remove all logic dealing with PKG_MODIFIED as this rule no longer exists. This removes a bunch of unnecessary stat and checksum logic that most of the time we were never even using. Also update the file modified checks to mark every file created using mkfile() with an older time so any modified checks will just work without hacks. Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'test/pacman/pmrule.py')
-rwxr-xr-xtest/pacman/pmrule.py6
1 files changed, 1 insertions, 5 deletions
diff --git a/test/pacman/pmrule.py b/test/pacman/pmrule.py
index c69e3cd3..3ba72fe7 100755
--- a/test/pacman/pmrule.py
+++ b/test/pacman/pmrule.py
@@ -69,13 +69,8 @@ class pmrule:
if not newpkg:
success = 0
else:
- util.vprint("\tnewpkg.checksum : %s" % newpkg.checksum)
- util.vprint("\tnewpkg.mtime : %s" % newpkg.mtime)
if case == "EXIST":
success = 1
- elif case == "MODIFIED":
- if not localdb.ispkgmodified(newpkg):
- success = 0
elif case == "VERSION":
if value != newpkg.version:
success = 0
@@ -121,6 +116,7 @@ class pmrule:
if f.name == key:
if not f.ismodified():
success = 0
+ break
elif case == "MODE":
if not os.path.isfile(filename):
success = 0