提交 d41f7d3f 编写于 作者: J James Troup

[JJ, r=JT] remove check for pre-depend on dpkg >= 1.10.24

上级 1dccc682
...@@ -329,9 +329,7 @@ def check_deb_ar(filename, control): ...@@ -329,9 +329,7 @@ def check_deb_ar(filename, control):
o control.tar.gz o control.tar.gz
o data.tar.gz or data.tar.bz2 o data.tar.gz or data.tar.bz2
in that order, and nothing else. If the third member is a in that order, and nothing else."""
data.tar.bz2, an additional check is performed for the required
Pre-Depends on dpkg (>= 1.10.24)."""
cmd = "ar t %s" % (filename) cmd = "ar t %s" % (filename)
(result, output) = commands.getstatusoutput(cmd) (result, output) = commands.getstatusoutput(cmd)
if result != 0: if result != 0:
...@@ -344,22 +342,7 @@ Pre-Depends on dpkg (>= 1.10.24).""" ...@@ -344,22 +342,7 @@ Pre-Depends on dpkg (>= 1.10.24)."""
reject("%s: first chunk is '%s', expected 'debian-binary'." % (filename, chunks[0])) reject("%s: first chunk is '%s', expected 'debian-binary'." % (filename, chunks[0]))
if chunks[1] != "control.tar.gz": if chunks[1] != "control.tar.gz":
reject("%s: second chunk is '%s', expected 'control.tar.gz'." % (filename, chunks[1])) reject("%s: second chunk is '%s', expected 'control.tar.gz'." % (filename, chunks[1]))
if chunks[2] == "data.tar.bz2": if chunks[2] not in [ "data.tar.bz2", "data.tar.gz" ]:
# Packages using bzip2 compression must have a Pre-Depends on dpkg >= 1.10.24.
found_needed_predep = 0
for parsed_dep in apt_pkg.ParseDepends(control.Find("Pre-Depends", "")):
for atom in parsed_dep:
(dep, version, constraint) = atom
if dep != "dpkg" or (constraint != ">=" and constraint != ">>") or \
len(parsed_dep) > 1: # or'ed deps don't count
continue
if (constraint == ">=" and apt_pkg.VersionCompare(version, "1.10.24") < 0) or \
(constraint == ">>" and apt_pkg.VersionCompare(version, "1.10.23") < 0):
continue
found_needed_predep = 1
if not found_needed_predep:
reject("%s: uses bzip2 compression, but doesn't Pre-Depend on dpkg (>= 1.10.24)" % (filename))
elif chunks[2] != "data.tar.gz":
reject("%s: third chunk is '%s', expected 'data.tar.gz' or 'data.tar.bz2'." % (filename, chunks[2])) reject("%s: third chunk is '%s', expected 'data.tar.gz' or 'data.tar.bz2'." % (filename, chunks[2]))
################################################################################ ################################################################################
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册