diff options
author | Dan McGee <dan@archlinux.org> | 2011-01-10 20:40:31 +0100 |
---|---|---|
committer | Dan McGee <dan@archlinux.org> | 2011-01-22 02:30:45 +0100 |
commit | bf46e04614b3740eea4a5e0d44767f57e1cffa4d (patch) | |
tree | 4a1fb5d578a539e42a1d73de1b3d83edbf17a58a /test/pacman/tests/epoch011.py | |
parent | 5c46ba14f780474e2b04b54aa7b0c8bf60de2b5b (diff) | |
download | pacman-bf46e04614b3740eea4a5e0d44767f57e1cffa4d.tar.gz pacman-bf46e04614b3740eea4a5e0d44767f57e1cffa4d.tar.xz |
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 <dan@archlinux.org>
Diffstat (limited to 'test/pacman/tests/epoch011.py')
-rw-r--r-- | test/pacman/tests/epoch011.py | 9 |
1 files changed, 3 insertions, 6 deletions
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") |