diff options
| author | Dan McGee <dan@archlinux.org> | 2011-01-10 13:40:31 -0600 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-01-21 19:30:45 -0600 |
| commit | bf46e04614b3740eea4a5e0d44767f57e1cffa4d (patch) | |
| tree | 4a1fb5d578a539e42a1d73de1b3d83edbf17a58a /test/pacman/tests/epoch012.py | |
| parent | 5c46ba14f780474e2b04b54aa7b0c8bf60de2b5b (diff) | |
| download | 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/epoch012.py')
| -rw-r--r-- | test/pacman/tests/epoch012.py | 6 |
1 files changed, 2 insertions, 4 deletions
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") |