X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fprocess_new.py;h=9ecfcdc6bbc2ade5ca50079f3880319d7fa23756;hb=425e44739cd77ffa01294f23e94ae7eabd5f5ec8;hp=8741d25ec887e0e19304b174473772ab47ae5119;hpb=0d80b258098ff470433efa4d9c1f81b404883195;p=dak.git diff --git a/dak/process_new.py b/dak/process_new.py index 8741d25e..9ecfcdc6 100755 --- a/dak/process_new.py +++ b/dak/process_new.py @@ -1,9 +1,12 @@ #!/usr/bin/env python # vim:set et ts=4 sw=4: -""" Handles NEW and BYHAND packages """ -# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 James Troup +""" Handles NEW and BYHAND packages +@contact: Debian FTP Master +@copyright: 2001, 2002, 2003, 2004, 2005, 2006 James Troup +@license: GNU General Public License version 2 or later +""" # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or @@ -37,7 +40,13 @@ ################################################################################ -import copy, errno, os, readline, stat, sys, time +import copy +import errno +import os +import readline +import stat +import sys +import time import apt_pkg, apt_inst import examine_package from daklib import database @@ -47,10 +56,10 @@ from daklib import utils from daklib.regexes import re_no_epoch, re_default_answer, re_isanum # Globals -Cnf = None +Cnf = None #: Configuration, apt_pkg.Configuration Options = None Upload = None -projectB = None +projectB = None #: database connection, pgobject Logger = None Priorities = None @@ -507,6 +516,7 @@ def check_pkg (): elif ftype == "dsc": examine_package.check_dsc(changes['distribution'], f) finally: + examine_package.output_package_relations() sys.stdout = stdout_fd except IOError, e: if e.errno == errno.EPIPE: @@ -727,6 +737,9 @@ def init(): Cnf["Process-New::Options::%s" % (i)] = "" changes_files = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv) + if len(changes_files) == 0 and not Cnf.get("Process-New::Options::Comments-Dir",""): + changes_files = utils.get_changes_files(Cnf["Dir::Queue::New"]) + Options = Cnf.SubTree("Process-New::Options") if Options["Help"]: @@ -842,7 +855,7 @@ def move_to_holding(suite, queue_dir): return Logger.log(["Moving to %s" % (suite,), Upload.pkg.changes_file]) Upload.dump_vars(queue_dir) - move_to_dir(queue_dir) + move_to_dir(queue_dir, perms=0664) os.unlink(Upload.pkg.changes_file[:-8]+".dak") def _accept():