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/epoch012.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 test/pacman/tests/epoch012.py (limited to 'test/pacman/tests/epoch012.py') 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 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/tests/epoch012.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'test/pacman/tests/epoch012.py') 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") -- cgit v1.2.3