X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Futils.py;h=ec1cd36686f8b3f943723b430f9850a1a061e2ab;hb=731c2232d9964d0f441ff5ea386e5e9937aa77ab;hp=9f244963dc7cdf8e6ac29e24b350197e11ac240e;hpb=c6e4df0a3357a7c08ff1cc0e94a7d978a0f1bdaf;p=dak.git diff --git a/daklib/utils.py b/daklib/utils.py index 9f244963..ec1cd366 100755 --- a/daklib/utils.py +++ b/daklib/utils.py @@ -22,7 +22,6 @@ # 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 @@ -39,18 +38,23 @@ import time 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 get_format_from_string +from collections import defaultdict ################################################################################ -default_config = "/etc/dak/dak.conf" #: default dak config, defines host properties +#default_config = "/etc/dak/dak.conf" #: default dak config, defines host properties +default_config = "/home/stew/etc/dak/dak.conf" #: default dak config, defines host properties default_apt_config = "/etc/dak/apt.conf" #: default apt config, not normally used alias_cache = None #: Cache for email alias checks @@ -60,6 +64,22 @@ key_uid_email_cache = {} #: Cache for email addresses from gpg key uids 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): @@ -352,75 +372,61 @@ def check_dsc_files(dsc_filename, dsc=None, dsc_files=None): 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)) - if dsc["format"] == "1.0": - if not (has_native_tar_gz or (has_orig_tar_gz and has_debian_diff)): - rejmsg.append("%s: no .tar.gz or .orig.tar.gz+.diff.gz in " - "'Files' field." % (dsc_filename)) - if (has_orig_tar_gz != has_orig_tar) or \ - (has_native_tar_gz != has_native_tar) or \ - has_debian_tar or has_more_orig_tar: - rejmsg.append("%s: contains source files not allowed in format 1.0" - % (dsc_filename)) - elif re.match(r"3\.\d+ \(native\)", dsc["format"]): - if not has_native_tar: - rejmsg.append("%s: lack required files for format 3.x (native)." - % (dsc_filename)) - if has_orig_tar or has_debian_diff or has_debian_tar or \ - has_more_orig_tar: - rejmsg.append("%s: contains source files not allowed in " - "format '3.x (native)'" % (dsc_filename)) - elif re.match(r"3\.\d+ \(quilt\)", dsc["format"]): - if not(has_orig_tar and has_debian_tar): - rejmsg.append("%s: lack required files for format " - "'3.x (quilt)'." % (dsc_filename)) - if has_debian_diff or has_native_tar: - rejmsg.append("%s: contains source files not allowed in format " - "3.x (quilt)" % (dsc_filename)) + + # 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 @@ -522,30 +528,9 @@ def build_file_list(changes, is_a_dsc=0, field="files", hashname="md5sum"): 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")) + # Get SourceFormat object for this Format and validate it + format = get_format_from_string(changes['format']) + format.validate_format(is_a_dsc=is_a_dsc, field=field) includes_section = (not is_a_dsc) and field == "files" @@ -1520,7 +1505,52 @@ apt_pkg.init() Cnf = apt_pkg.newConfiguration() apt_pkg.ReadConfigFileISC(Cnf,default_config) -if which_conf_file() != default_config: - apt_pkg.ReadConfigFileISC(Cnf,which_conf_file()) +#if which_conf_file() != default_config: +# apt_pkg.ReadConfigFileISC(Cnf,which_conf_file()) ############################################################################### + +def ensure_orig_files(changes, dest_dir, session): + """ + Ensure that dest_dir contains all the orig tarballs for the specified + changes. If it does not, symlink them into place. + + Returns a 2-tuple (already_exists, symlinked) containing a list of files + that were already there and a list of files that were symlinked into place. + """ + + exists, symlinked = [], [] + + for dsc_file in changes.dsc_files: + + # Skip all files that are not orig tarballs + if not re_is_orig_source.match(dsc_file): + continue + + # Skip orig files not identified in the pool + if not (dsc_file in changes.orig_files and + 'id' in changes.orig_files[dsc_file]): + continue + + dest = os.path.join(dest_dir, dsc_file) + + if os.path.exists(dest): + exists.append(dest) + continue + + orig_file_id = changes.orig_files[dsc_file]['id'] + + c = session.execute( + 'SELECT l.path, f.filename FROM location l, files f WHERE f.id = :id and f.location = l.id', + {'id': orig_file_id} + ) + + res = c.fetchone() + if not res: + return "[INTERNAL ERROR] Couldn't find id %s in files table." % orig_file_id + + src = os.path.join(res[0], res[1]) + os.symlink(src, dest) + symlinked.append(dest) + + return (exists, symlinked)