From 50f446886b8b09b9bcdb30494d7a0c4d93a8a37a Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 3 Jan 2011 17:28:20 -0600 Subject: pactest: Rename epoch pactests Signed-off-by: Dan McGee --- test/pacman/tests/epoch001.py | 13 +++++++++++++ test/pacman/tests/epoch002.py | 13 +++++++++++++ test/pacman/tests/epoch003.py | 14 ++++++++++++++ test/pacman/tests/epoch004.py | 18 ++++++++++++++++++ test/pacman/tests/sync140.py | 13 ------------- test/pacman/tests/sync141.py | 13 ------------- test/pacman/tests/sync142.py | 14 -------------- test/pacman/tests/sync143.py | 18 ------------------ 8 files changed, 58 insertions(+), 58 deletions(-) create mode 100644 test/pacman/tests/epoch001.py create mode 100644 test/pacman/tests/epoch002.py create mode 100644 test/pacman/tests/epoch003.py create mode 100644 test/pacman/tests/epoch004.py delete mode 100644 test/pacman/tests/sync140.py delete mode 100644 test/pacman/tests/sync141.py delete mode 100644 test/pacman/tests/sync142.py delete mode 100644 test/pacman/tests/sync143.py (limited to 'test') diff --git a/test/pacman/tests/epoch001.py b/test/pacman/tests/epoch001.py new file mode 100644 index 00000000..b7ec9fcf --- /dev/null +++ b/test/pacman/tests/epoch001.py @@ -0,0 +1,13 @@ +self.description = "Sysupgrade with a sync package having higher epoch" + +sp = pmpkg("dummy", "1.0-1") +sp.epoch = 1 +self.addpkg2db("sync", sp) + +lp = pmpkg("dummy", "1.1-1") +self.addpkg2db("local", lp) + +self.args = "-Su" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_VERSION=dummy|1.0-1") diff --git a/test/pacman/tests/epoch002.py b/test/pacman/tests/epoch002.py new file mode 100644 index 00000000..dac81f76 --- /dev/null +++ b/test/pacman/tests/epoch002.py @@ -0,0 +1,13 @@ +self.description = "Sysupgrade with an epoch and ignore on same package" + +lp = pmpkg("dummy", "1.0-1") +self.addpkg2db("local", lp) + +sp = pmpkg("dummy", "1.0-2") +sp.epoch = 1 +self.addpkg2db("sync", sp) + +self.args = "-Su --ignore %s" % lp.name + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_VERSION=dummy|1.0-1") diff --git a/test/pacman/tests/epoch003.py b/test/pacman/tests/epoch003.py new file mode 100644 index 00000000..726ef304 --- /dev/null +++ b/test/pacman/tests/epoch003.py @@ -0,0 +1,14 @@ +self.description = "Sysupgrade with an epoch package overriding a force package" + +sp = pmpkg("dummy", "1.4-1") +sp.epoch = 2 +self.addpkg2db("sync", sp) + +lp = pmpkg("dummy", "2.0-1") +lp.force = True +self.addpkg2db("local", lp) + +self.args = "-Su" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_VERSION=dummy|1.4-1") diff --git a/test/pacman/tests/epoch004.py b/test/pacman/tests/epoch004.py new file mode 100644 index 00000000..2ee940a9 --- /dev/null +++ b/test/pacman/tests/epoch004.py @@ -0,0 +1,18 @@ +self.description = "Sysupgrade with same version, different epochs" + +sp = pmpkg("dummy", "2.0-1") +sp.files = ["bin/dummynew"] +sp.epoch = 2 +self.addpkg2db("sync", sp) + +lp = pmpkg("dummy", "2.0-1") +lp.files = ["bin/dummyold"] +lp.force = True +self.addpkg2db("local", lp) + +self.args = "-Su" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_VERSION=dummy|2.0-1") +self.addrule("FILE_EXIST=bin/dummynew") +self.addrule("!FILE_EXIST=bin/dummyold") diff --git a/test/pacman/tests/sync140.py b/test/pacman/tests/sync140.py deleted file mode 100644 index b7ec9fcf..00000000 --- a/test/pacman/tests/sync140.py +++ /dev/null @@ -1,13 +0,0 @@ -self.description = "Sysupgrade with a sync package having higher epoch" - -sp = pmpkg("dummy", "1.0-1") -sp.epoch = 1 -self.addpkg2db("sync", sp) - -lp = pmpkg("dummy", "1.1-1") -self.addpkg2db("local", lp) - -self.args = "-Su" - -self.addrule("PACMAN_RETCODE=0") -self.addrule("PKG_VERSION=dummy|1.0-1") diff --git a/test/pacman/tests/sync141.py b/test/pacman/tests/sync141.py deleted file mode 100644 index dac81f76..00000000 --- a/test/pacman/tests/sync141.py +++ /dev/null @@ -1,13 +0,0 @@ -self.description = "Sysupgrade with an epoch and ignore on same package" - -lp = pmpkg("dummy", "1.0-1") -self.addpkg2db("local", lp) - -sp = pmpkg("dummy", "1.0-2") -sp.epoch = 1 -self.addpkg2db("sync", sp) - -self.args = "-Su --ignore %s" % lp.name - -self.addrule("PACMAN_RETCODE=0") -self.addrule("PKG_VERSION=dummy|1.0-1") diff --git a/test/pacman/tests/sync142.py b/test/pacman/tests/sync142.py deleted file mode 100644 index 726ef304..00000000 --- a/test/pacman/tests/sync142.py +++ /dev/null @@ -1,14 +0,0 @@ -self.description = "Sysupgrade with an epoch package overriding a force package" - -sp = pmpkg("dummy", "1.4-1") -sp.epoch = 2 -self.addpkg2db("sync", sp) - -lp = pmpkg("dummy", "2.0-1") -lp.force = True -self.addpkg2db("local", lp) - -self.args = "-Su" - -self.addrule("PACMAN_RETCODE=0") -self.addrule("PKG_VERSION=dummy|1.4-1") diff --git a/test/pacman/tests/sync143.py b/test/pacman/tests/sync143.py deleted file mode 100644 index 2ee940a9..00000000 --- a/test/pacman/tests/sync143.py +++ /dev/null @@ -1,18 +0,0 @@ -self.description = "Sysupgrade with same version, different epochs" - -sp = pmpkg("dummy", "2.0-1") -sp.files = ["bin/dummynew"] -sp.epoch = 2 -self.addpkg2db("sync", sp) - -lp = pmpkg("dummy", "2.0-1") -lp.files = ["bin/dummyold"] -lp.force = True -self.addpkg2db("local", lp) - -self.args = "-Su" - -self.addrule("PACMAN_RETCODE=0") -self.addrule("PKG_VERSION=dummy|2.0-1") -self.addrule("FILE_EXIST=bin/dummynew") -self.addrule("!FILE_EXIST=bin/dummyold") -- cgit v1.2.3-24-g4f1b From e068b58507ad58e2037aeb323a74d27377a0feac Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 3 Jan 2011 18:35:27 -0600 Subject: pactest: add more testing for epoch Signed-off-by: Dan McGee --- test/pacman/tests/epoch001.py | 1 + test/pacman/tests/epoch002.py | 1 + test/pacman/tests/epoch003.py | 1 + test/pacman/tests/epoch004.py | 1 + test/pacman/tests/epoch010.py | 14 ++++++++++++++ test/pacman/tests/epoch011.py | 15 +++++++++++++++ test/pacman/tests/epoch012.py | 15 +++++++++++++++ 7 files changed, 48 insertions(+) create mode 100644 test/pacman/tests/epoch010.py create mode 100644 test/pacman/tests/epoch011.py create mode 100644 test/pacman/tests/epoch012.py (limited to 'test') diff --git a/test/pacman/tests/epoch001.py b/test/pacman/tests/epoch001.py index b7ec9fcf..e1d31142 100644 --- a/test/pacman/tests/epoch001.py +++ b/test/pacman/tests/epoch001.py @@ -11,3 +11,4 @@ self.args = "-Su" self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_VERSION=dummy|1.0-1") +self.addrule("PKG_EPOCH=dummy|1") diff --git a/test/pacman/tests/epoch002.py b/test/pacman/tests/epoch002.py index dac81f76..9e8a0482 100644 --- a/test/pacman/tests/epoch002.py +++ b/test/pacman/tests/epoch002.py @@ -11,3 +11,4 @@ self.args = "-Su --ignore %s" % lp.name self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_VERSION=dummy|1.0-1") +self.addrule("PKG_EPOCH=dummy|0") diff --git a/test/pacman/tests/epoch003.py b/test/pacman/tests/epoch003.py index 726ef304..17ca9bfb 100644 --- a/test/pacman/tests/epoch003.py +++ b/test/pacman/tests/epoch003.py @@ -12,3 +12,4 @@ self.args = "-Su" self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_VERSION=dummy|1.4-1") +self.addrule("PKG_EPOCH=dummy|2") diff --git a/test/pacman/tests/epoch004.py b/test/pacman/tests/epoch004.py index 2ee940a9..ad3e9953 100644 --- a/test/pacman/tests/epoch004.py +++ b/test/pacman/tests/epoch004.py @@ -16,3 +16,4 @@ self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_VERSION=dummy|2.0-1") self.addrule("FILE_EXIST=bin/dummynew") self.addrule("!FILE_EXIST=bin/dummyold") +self.addrule("PKG_EPOCH=dummy|2") diff --git a/test/pacman/tests/epoch010.py b/test/pacman/tests/epoch010.py new file mode 100644 index 00000000..3277597b --- /dev/null +++ b/test/pacman/tests/epoch010.py @@ -0,0 +1,14 @@ +self.description = "usbutils case study: force in new package" + +sp = pmpkg("usbutils", "001-1") +sp.force = True +self.addpkg2db("sync", sp) + +lp = pmpkg("usbutils", "0.91-4") +self.addpkg2db("local", lp) + +self.args = "-Su" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_VERSION=usbutils|001-1") +self.addrule("PKG_EPOCH=usbutils|1") diff --git a/test/pacman/tests/epoch011.py b/test/pacman/tests/epoch011.py new file mode 100644 index 00000000..2c064aa1 --- /dev/null +++ b/test/pacman/tests/epoch011.py @@ -0,0 +1,15 @@ +self.description = "usbutils case study: force stays, epoch now in local db" + +sp = pmpkg("usbutils", "002-1") +sp.force = True +self.addpkg2db("sync", sp) + +lp = pmpkg("usbutils", "001-1") +lp.epoch = 1 +self.addpkg2db("local", lp) + +self.args = "-Su" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_VERSION=usbutils|002-1") +self.addrule("PKG_EPOCH=usbutils|1") diff --git a/test/pacman/tests/epoch012.py b/test/pacman/tests/epoch012.py new file mode 100644 index 00000000..e0c7314d --- /dev/null +++ b/test/pacman/tests/epoch012.py @@ -0,0 +1,15 @@ +self.description = "usbutils case study: maintainer screws up and removes force" + +sp = pmpkg("usbutils", "003-1") +self.addpkg2db("sync", sp) + +lp = pmpkg("usbutils", "002-1") +lp.epoch = 1 +self.addpkg2db("local", lp) + +self.args = "-Su" + +self.addrule("PACMAN_RETCODE=0") +# remember, this is how we have to handle this- 003 will not be installed +self.addrule("PKG_VERSION=usbutils|002-1") +self.addrule("PKG_EPOCH=usbutils|1") -- cgit v1.2.3-24-g4f1b From 5c46ba14f780474e2b04b54aa7b0c8bf60de2b5b Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 10 Jan 2011 10:44:25 -0600 Subject: Allow version comparison to contain epoch specifier Adapting from RPM, follow the [epoch:]version[-release] syntax. We can also borrow some of their parsing code for our purposes (thanks!). Add some new tests to our vercmp shell script tester for epoch comparisons, and then make the code work with these newfangled epoch specifiers. Signed-off-by: Dan McGee --- test/util/vercmptest.sh | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'test') diff --git a/test/util/vercmptest.sh b/test/util/vercmptest.sh index fca06578..a9ed3b2a 100755 --- a/test/util/vercmptest.sh +++ b/test/util/vercmptest.sh @@ -118,6 +118,25 @@ runtest 1.5.1 1.5.b 1 runtest 1.5.b-1 1.5.b 0 runtest 1.5-1 1.5.b -1 +# epoch included version comparisons +runtest 0:1.0 0:1.0 0 +runtest 0:1.0 0:1.1 -1 +runtest 1:1.0 0:1.0 1 +runtest 1:1.0 0:1.1 1 +runtest 1:1.0 2:1.1 -1 + +# epoch + sometimes present pkgrel +runtest 1:1.0 0:1.0-1 1 +runtest 1:1.0-1 0:1.1-1 1 + +# epoch included on one version +runtest 0:1.0 1.0 0 +runtest 0:1.0 1.1 -1 +runtest 0:1.1 1.0 1 +runtest 1:1.0 1.0 1 +runtest 1:1.0 1.1 1 +runtest 1:1.1 1.1 1 + #END TESTS echo -- cgit v1.2.3-24-g4f1b From bf46e04614b3740eea4a5e0d44767f57e1cffa4d Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 10 Jan 2011 13:40:31 -0600 Subject: Remove epoch as an independent field Instead, go the same route we have always taken with version-release in libalpm and treat it all as one piece of information. Makepkg is the only script that knows about epoch as a distinct value; from there on out we will parse out the components as necessary. This makes the code a lot simpler as far as epoch handling goes. The downside here is that we are tossing some compatibility to the wind; packages using force will have to be rebuilt with an incremented epoch to keep their special status. Signed-off-by: Dan McGee --- test/pacman/pmdb.py | 14 -------------- test/pacman/pmpkg.py | 6 ------ test/pacman/pmrule.py | 3 --- test/pacman/tests/epoch001.py | 6 ++---- test/pacman/tests/epoch002.py | 4 +--- test/pacman/tests/epoch003.py | 9 +++------ test/pacman/tests/epoch004.py | 9 +++------ test/pacman/tests/epoch010.py | 6 ++---- test/pacman/tests/epoch011.py | 9 +++------ test/pacman/tests/epoch012.py | 6 ++---- test/pacman/tests/sync136.py | 5 ++--- test/pacman/tests/sync137.py | 3 +-- 12 files changed, 19 insertions(+), 61 deletions(-) (limited to 'test') diff --git a/test/pacman/pmdb.py b/test/pacman/pmdb.py index b4d0e2d5..6329f23d 100755 --- a/test/pacman/pmdb.py +++ b/test/pacman/pmdb.py @@ -156,11 +156,6 @@ class pmdb: pkg.md5sum = fd.readline().strip("\n") elif line == "%REPLACES%": pkg.replaces = _getsection(fd) - elif line == "%EPOCH%": - pkg.epoch = int(fd.readline().strip("\n")) - elif line == "%FORCE%": - fd.readline() - pkg.force = True elif line == "%DEPENDS%": pkg.depends = _getsection(fd) elif line == "%OPTDEPENDS%": @@ -250,19 +245,10 @@ class pmdb: data.append(_mksection("SIZE", pkg.size)) if pkg.reason: data.append(_mksection("REASON", pkg.reason)) - if pkg.epoch: - data.append(_mksection("EPOCH", pkg.epoch)) else: data.append(_mksection("FILENAME", pkg.filename())) if pkg.replaces: data.append(_mksection("REPLACES", pkg.replaces)) - if pkg.epoch: - data.append(_mksection("EPOCH", pkg.epoch)) - # for backward compatibility - if not pkg.force: - data.append(_mksection("FORCE", "")) - if pkg.force: - data.append(_mksection("FORCE", "")) if pkg.csize: data.append(_mksection("CSIZE", pkg.csize)) if pkg.md5sum: diff --git a/test/pacman/pmpkg.py b/test/pacman/pmpkg.py index 3aabea49..988f4c28 100755 --- a/test/pacman/pmpkg.py +++ b/test/pacman/pmpkg.py @@ -49,8 +49,6 @@ class pmpkg: self.reason = 0 self.md5sum = "" # sync only self.replaces = [] - self.force = False - self.epoch = 0 self.depends = [] self.optdepends = [] self.conflicts = [] @@ -132,10 +130,6 @@ class pmpkg: data.append("builddate = %s" % self.builddate) data.append("packager = %s" % self.packager) data.append("size = %s" % self.size) - if self.force: - data.append("force = true") - if self.epoch: - data.append("epoch = %d" % self.epoch) if self.arch: data.append("arch = %s" % self.arch) for i in self.license: diff --git a/test/pacman/pmrule.py b/test/pacman/pmrule.py index bea8e4a4..89ae3f49 100755 --- a/test/pacman/pmrule.py +++ b/test/pacman/pmrule.py @@ -78,9 +78,6 @@ class pmrule: elif case == "VERSION": if value != newpkg.version: success = 0 - elif case == "EPOCH": - if int(value) != newpkg.epoch: - success = 0 elif case == "DESC": if value != newpkg.desc: success = 0 diff --git a/test/pacman/tests/epoch001.py b/test/pacman/tests/epoch001.py index e1d31142..ac6c41a6 100644 --- a/test/pacman/tests/epoch001.py +++ b/test/pacman/tests/epoch001.py @@ -1,7 +1,6 @@ self.description = "Sysupgrade with a sync package having higher epoch" -sp = pmpkg("dummy", "1.0-1") -sp.epoch = 1 +sp = pmpkg("dummy", "1:1.0-1") self.addpkg2db("sync", sp) lp = pmpkg("dummy", "1.1-1") @@ -10,5 +9,4 @@ self.addpkg2db("local", lp) self.args = "-Su" self.addrule("PACMAN_RETCODE=0") -self.addrule("PKG_VERSION=dummy|1.0-1") -self.addrule("PKG_EPOCH=dummy|1") +self.addrule("PKG_VERSION=dummy|1:1.0-1") diff --git a/test/pacman/tests/epoch002.py b/test/pacman/tests/epoch002.py index 9e8a0482..8ca4afc6 100644 --- a/test/pacman/tests/epoch002.py +++ b/test/pacman/tests/epoch002.py @@ -3,12 +3,10 @@ self.description = "Sysupgrade with an epoch and ignore on same package" lp = pmpkg("dummy", "1.0-1") self.addpkg2db("local", lp) -sp = pmpkg("dummy", "1.0-2") -sp.epoch = 1 +sp = pmpkg("dummy", "1:1.0-2") self.addpkg2db("sync", sp) self.args = "-Su --ignore %s" % lp.name self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_VERSION=dummy|1.0-1") -self.addrule("PKG_EPOCH=dummy|0") diff --git a/test/pacman/tests/epoch003.py b/test/pacman/tests/epoch003.py index 17ca9bfb..ac395e30 100644 --- a/test/pacman/tests/epoch003.py +++ b/test/pacman/tests/epoch003.py @@ -1,15 +1,12 @@ self.description = "Sysupgrade with an epoch package overriding a force package" -sp = pmpkg("dummy", "1.4-1") -sp.epoch = 2 +sp = pmpkg("dummy", "2:1.4-1") self.addpkg2db("sync", sp) -lp = pmpkg("dummy", "2.0-1") -lp.force = True +lp = pmpkg("dummy", "1:2.0-1") self.addpkg2db("local", lp) self.args = "-Su" self.addrule("PACMAN_RETCODE=0") -self.addrule("PKG_VERSION=dummy|1.4-1") -self.addrule("PKG_EPOCH=dummy|2") +self.addrule("PKG_VERSION=dummy|2:1.4-1") diff --git a/test/pacman/tests/epoch004.py b/test/pacman/tests/epoch004.py index ad3e9953..74b00c2b 100644 --- a/test/pacman/tests/epoch004.py +++ b/test/pacman/tests/epoch004.py @@ -1,19 +1,16 @@ self.description = "Sysupgrade with same version, different epochs" -sp = pmpkg("dummy", "2.0-1") +sp = pmpkg("dummy", "2:2.0-1") sp.files = ["bin/dummynew"] -sp.epoch = 2 self.addpkg2db("sync", sp) -lp = pmpkg("dummy", "2.0-1") +lp = pmpkg("dummy", "1:2.0-1") lp.files = ["bin/dummyold"] -lp.force = True self.addpkg2db("local", lp) self.args = "-Su" self.addrule("PACMAN_RETCODE=0") -self.addrule("PKG_VERSION=dummy|2.0-1") +self.addrule("PKG_VERSION=dummy|2:2.0-1") self.addrule("FILE_EXIST=bin/dummynew") self.addrule("!FILE_EXIST=bin/dummyold") -self.addrule("PKG_EPOCH=dummy|2") diff --git a/test/pacman/tests/epoch010.py b/test/pacman/tests/epoch010.py index 3277597b..03bba273 100644 --- a/test/pacman/tests/epoch010.py +++ b/test/pacman/tests/epoch010.py @@ -1,7 +1,6 @@ self.description = "usbutils case study: force in new package" -sp = pmpkg("usbutils", "001-1") -sp.force = True +sp = pmpkg("usbutils", "1:001-1") self.addpkg2db("sync", sp) lp = pmpkg("usbutils", "0.91-4") @@ -10,5 +9,4 @@ self.addpkg2db("local", lp) self.args = "-Su" self.addrule("PACMAN_RETCODE=0") -self.addrule("PKG_VERSION=usbutils|001-1") -self.addrule("PKG_EPOCH=usbutils|1") +self.addrule("PKG_VERSION=usbutils|1:001-1") diff --git a/test/pacman/tests/epoch011.py b/test/pacman/tests/epoch011.py index 2c064aa1..bc5ee619 100644 --- a/test/pacman/tests/epoch011.py +++ b/test/pacman/tests/epoch011.py @@ -1,15 +1,12 @@ self.description = "usbutils case study: force stays, epoch now in local db" -sp = pmpkg("usbutils", "002-1") -sp.force = True +sp = pmpkg("usbutils", "1:002-1") self.addpkg2db("sync", sp) -lp = pmpkg("usbutils", "001-1") -lp.epoch = 1 +lp = pmpkg("usbutils", "1:001-1") self.addpkg2db("local", lp) self.args = "-Su" self.addrule("PACMAN_RETCODE=0") -self.addrule("PKG_VERSION=usbutils|002-1") -self.addrule("PKG_EPOCH=usbutils|1") +self.addrule("PKG_VERSION=usbutils|1:002-1") diff --git a/test/pacman/tests/epoch012.py b/test/pacman/tests/epoch012.py index e0c7314d..2a7a7ac2 100644 --- a/test/pacman/tests/epoch012.py +++ b/test/pacman/tests/epoch012.py @@ -3,13 +3,11 @@ self.description = "usbutils case study: maintainer screws up and removes force" sp = pmpkg("usbutils", "003-1") self.addpkg2db("sync", sp) -lp = pmpkg("usbutils", "002-1") -lp.epoch = 1 +lp = pmpkg("usbutils", "1:002-1") self.addpkg2db("local", lp) self.args = "-Su" self.addrule("PACMAN_RETCODE=0") # remember, this is how we have to handle this- 003 will not be installed -self.addrule("PKG_VERSION=usbutils|002-1") -self.addrule("PKG_EPOCH=usbutils|1") +self.addrule("PKG_VERSION=usbutils|1:002-1") diff --git a/test/pacman/tests/sync136.py b/test/pacman/tests/sync136.py index b3a6baf4..b31aae2c 100644 --- a/test/pacman/tests/sync136.py +++ b/test/pacman/tests/sync136.py @@ -1,7 +1,6 @@ self.description = "Sysupgrade with a sync package forcing a downgrade" -sp = pmpkg("dummy", "1.0-1") -sp.force = True +sp = pmpkg("dummy", "1:1.0-1") self.addpkg2db("sync", sp) @@ -12,4 +11,4 @@ self.addpkg2db("local", lp) self.args = "-Su" self.addrule("PACMAN_RETCODE=0") -self.addrule("PKG_VERSION=dummy|1.0-1") +self.addrule("PKG_VERSION=dummy|1:1.0-1") diff --git a/test/pacman/tests/sync137.py b/test/pacman/tests/sync137.py index 000855c5..d76ac49d 100644 --- a/test/pacman/tests/sync137.py +++ b/test/pacman/tests/sync137.py @@ -4,8 +4,7 @@ lp = pmpkg("dummy", "1.0-1") self.addpkg2db("local", lp) -sp = pmpkg("dummy", "1.0-2") -sp.force = True +sp = pmpkg("dummy", "1:1.0-2") self.addpkg2db("sync", sp) self.args = "-Su --ignore %s" % lp.name -- cgit v1.2.3-24-g4f1b