# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-import codecs
import commands
import email.Header
import os
import re
import string
import email as modemail
+import subprocess
from dbconn import DBConn, get_architecture, get_component, get_suite
from dak_exceptions import *
from textutils import fix_maintainer
from regexes import re_html_escaping, html_escaping, re_single_line_field, \
- re_multi_line_field, re_srchasver, re_verwithext, \
- re_parse_maintainer, re_taint_free, re_gpg_uid, \
- re_re_mark, re_whitespace_comment, re_issource
+ re_multi_line_field, re_srchasver, re_taint_free, \
+ re_gpg_uid, re_re_mark, re_whitespace_comment, re_issource, \
+ re_is_orig_source
-from srcformats import srcformats
+from formats import parse_format, validate_changes_format
+from srcformats import get_format_from_string
+from collections import defaultdict
################################################################################
known_hashes = [("sha1", apt_pkg.sha1sum, (1, 8)),
("sha256", apt_pkg.sha256sum, (1, 8))] #: hashes we accept for entries in .changes/.dsc
+# Monkeypatch commands.getstatusoutput as it returns a "0" exit code in
+# all situations under lenny's Python.
+import commands
+def dak_getstatusoutput(cmd):
+ pipe = subprocess.Popen(cmd, shell=True, universal_newlines=True,
+ stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+
+ output = "".join(pipe.stdout.readlines())
+
+ ret = pipe.wait()
+ if ret is None:
+ ret = 0
+
+ return ret, output
+commands.getstatusoutput = dak_getstatusoutput
+
################################################################################
def html_escape(s):
rejmsg = []
# Parse the file if needed
- if dsc == None:
+ if dsc is None:
dsc = parse_changes(dsc_filename, signing_rules=1);
- if dsc_files == None:
+
+ if dsc_files is None:
dsc_files = build_file_list(dsc, is_a_dsc=1)
# Ensure .dsc lists proper set of source files according to the format
# announced
- has_native_tar = 0
- has_native_tar_gz = 0
- has_orig_tar = 0
- has_orig_tar_gz = 0
- has_more_orig_tar = 0
- has_debian_tar = 0
- has_debian_diff = 0
+ has = defaultdict(lambda: 0)
+
+ ftype_lookup = (
+ (r'orig.tar.gz', ('orig_tar_gz', 'orig_tar')),
+ (r'diff.gz', ('debian_diff',)),
+ (r'tar.gz', ('native_tar_gz', 'native_tar')),
+ (r'debian\.tar\.(gz|bz2)', ('debian_tar',)),
+ (r'orig\.tar\.(gz|bz2)', ('orig_tar',)),
+ (r'tar\.(gz|bz2)', ('native_tar',)),
+ (r'orig-.+\.tar\.(gz|bz2)', ('more_orig_tar',)),
+ )
+
for f in dsc_files.keys():
m = re_issource.match(f)
if not m:
rejmsg.append("%s: %s in Files field not recognised as source."
% (dsc_filename, f))
continue
- ftype = m.group(3)
- if ftype == "orig.tar.gz":
- has_orig_tar_gz += 1
- has_orig_tar += 1
- elif ftype == "diff.gz":
- has_debian_diff += 1
- elif ftype == "tar.gz":
- has_native_tar_gz += 1
- has_native_tar += 1
- elif re.match(r"debian\.tar\.(gz|bz2|lzma)", ftype):
- has_debian_tar += 1
- elif re.match(r"orig\.tar\.(gz|bz2|lzma)", ftype):
- has_orig_tar += 1
- elif re.match(r"tar\.(gz|bz2|lzma)", ftype):
- has_native_tar += 1
- elif re.match(r"orig-.+\.tar\.(gz|bz2|lzma)", ftype):
- has_more_orig_tar += 1
- else:
+
+ # Populate 'has' dictionary by resolving keys in lookup table
+ matched = False
+ for regex, keys in ftype_lookup:
+ if re.match(regex, m.group(3)):
+ matched = True
+ for key in keys:
+ has[key] += 1
+ break
+
+ # File does not match anything in lookup table; reject
+ if not matched:
reject("%s: unexpected source file '%s'" % (dsc_filename, f))
- if has_orig_tar > 1:
- rejmsg.append("%s: lists multiple .orig tarballs." % (dsc_filename))
- if has_native_tar > 1:
- rejmsg.append("%s: lists multiple native tarballs." % (dsc_filename))
- if has_debian_tar > 1 or has_debian_diff > 1:
- rejmsg.append("%s: lists multiple debian diff/tarballs." % (dsc_filename))
-
- for format in srcformats:
- if format.re_format.match(dsc['format']):
- rejmsg.extend(format.reject_msgs(
- dsc_filename,
- has_native_tar,
- has_native_tar_gz,
- has_debian_tar,
- has_debian_diff,
- has_orig_tar,
- has_orig_tar_gz,
- has_more_orig_tar
- ))
- break
+
+ # Check for multiple files
+ for file_type in ('orig_tar', 'native_tar', 'debian_tar', 'debian_diff'):
+ if has[file_type] > 1:
+ rejmsg.append("%s: lists multiple %s" % (dsc_filename, file_type))
+
+ # Source format specific tests
+ try:
+ format = get_format_from_string(dsc['format'])
+ rejmsg.extend([
+ '%s: %s' % (dsc_filename, x) for x in format.reject_msgs(has)
+ ])
+
+ except UnknownFormatError:
+ # Not an error here for now
+ pass
return rejmsg
if not changes.has_key(field):
raise NoFilesFieldError
- # Make sure we recognise the format of the Files: field
- format = re_verwithext.search(changes.get("format", "0.0"))
- if not format:
- raise UnknownFormatError, "%s" % (changes.get("format","0.0"))
-
- format = format.groups()
- if format[1] == None:
- format = int(float(format[0])), 0, format[2]
- else:
- format = int(format[0]), int(format[1]), format[2]
- if format[2] == None:
- format = format[:2]
-
- if is_a_dsc:
- # format = (0,0) are missing format headers of which we still
- # have some in the archive.
- if format != (1,0) and format != (0,0) and \
- format != (3,0,"quilt") and format != (3,0,"native"):
- raise UnknownFormatError, "%s" % (changes.get("format","0.0"))
- else:
- if (format < (1,5) or format > (1,8)):
- raise UnknownFormatError, "%s" % (changes.get("format","0.0"))
- if field != "files" and format < (1,8):
- raise UnknownFormatError, "%s" % (changes.get("format","0.0"))
+ # Validate .changes Format: field
+ if not is_a_dsc:
+ validate_changes_format(parse_format(changes['format']), field)
includes_section = (not is_a_dsc) and field == "files"
if which_conf_file() != default_config:
apt_pkg.ReadConfigFileISC(Cnf,which_conf_file())
-
-###############################################################################
projects / dak.git / blobdiff