mirror of
https://github.com/moparisthebest/pacman
synced 2024-08-13 17:03:46 -04:00
Add epoch support to pactest
This adds epoch support to pactest, while still producing packages and database entries the same way makepkg and repo-add currently do in a backward compatible fashion (still including the 'force' option). Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
parent
6f37ba61ed
commit
8aa7ed5a7e
@ -158,6 +158,8 @@ 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 = 1
|
||||
@ -206,12 +208,6 @@ class pmdb:
|
||||
pkg.conflicts = _getsection(fd)
|
||||
elif line == "%PROVIDES%":
|
||||
pkg.provides = _getsection(fd)
|
||||
# TODO this was going to be changed, but isn't anymore
|
||||
#elif line == "%REPLACES%":
|
||||
# pkg.replaces = _getsection(fd)
|
||||
#elif line == "%FORCE%":
|
||||
# fd.readline()
|
||||
# pkg.force = 1
|
||||
fd.close()
|
||||
pkg.checksum["depends"] = getmd5sum(filename)
|
||||
pkg.mtime["depends"] = getmtime(filename)
|
||||
@ -267,6 +263,11 @@ class pmdb:
|
||||
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:
|
||||
@ -308,11 +309,6 @@ class pmdb:
|
||||
data.append(_mksection("CONFLICTS", pkg.conflicts))
|
||||
if pkg.provides:
|
||||
data.append(_mksection("PROVIDES", pkg.provides))
|
||||
#if self.treename != "local":
|
||||
# if pkg.replaces:
|
||||
# data.append(_mksection("REPLACES", pkg.replaces))
|
||||
# if pkg.force:
|
||||
# data.append(_mksection("FORCE", ""))
|
||||
if data:
|
||||
data.append("")
|
||||
filename = os.path.join(path, "depends")
|
||||
|
@ -48,8 +48,9 @@ class pmpkg:
|
||||
self.csize = 0
|
||||
self.reason = 0
|
||||
self.md5sum = "" # sync only
|
||||
self.replaces = [] # sync only (will be moved to depends)
|
||||
self.force = 0 # sync only (will be moved to depends)
|
||||
self.replaces = []
|
||||
self.force = 0
|
||||
self.epoch = 0
|
||||
# depends
|
||||
self.depends = []
|
||||
self.optdepends = []
|
||||
|
@ -154,6 +154,10 @@ def mkdescfile(filename, pkg):
|
||||
data.append("provides = %s" % i)
|
||||
for i in pkg.backup:
|
||||
data.append("backup = %s" % i)
|
||||
if pkg.epoch:
|
||||
data.append("epoch = %d" % pkg.epoch)
|
||||
if not pkg.force:
|
||||
data.append("force = 1")
|
||||
if pkg.force:
|
||||
data.append("force = 1")
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user