from daklib.queue import *
from daklib import daklog
from daklib import utils
-from daklib.regexes import re_no_epoch, re_default_answer, re_isanum
+from daklib.regexes import re_no_epoch, re_default_answer, re_isanum, re_package
from daklib.dak_exceptions import CantOpenError, AlreadyLockedError, CantGetLockError
from daklib.summarystats import SummaryStats
from daklib.config import Config
################################################################################
def recheck(upload, session):
- upload.recheck()
+# STU: I'm not sure, but I don't thin kthis is necessary any longer: upload.recheck(session)
if len(upload.rejects) > 0:
answer = "XXX"
if Options["No-Action"] or Options["Automatic"] or Options["Trainee"]:
answer = 'S'
- print "REJECT\n" + upload.rejects.join("\n"),
+ print "REJECT\n%s" % '\n'.join(upload.rejects)
prompt = "[R]eject, Skip, Quit ?"
while prompt.find(answer) == -1:
answer = answer[:1].upper()
if answer == 'R':
- upload.do_reject(manual=0, reject_message=upload.rejects.join("\n"))
- os.unlink(upload.pkg.changes_file[:-8]+".dak")
+ upload.do_reject(manual=0, reject_message='\n'.join(upload.rejects))
return 0
elif answer == 'S':
return 0
for filename in changes_files:
u = Upload()
try:
- u.pkg.load_dot_dak(filename)
+ u.pkg.changes_file = filename
+ u.load_changes(filename)
u.update_subst()
cache[filename] = copy.copy(u.pkg.changes)
cache[filename]["filename"] = filename
def do_new(upload, session):
print "NEW\n"
files = upload.pkg.files
+ upload.check_files(not Options["No-Action"])
changes = upload.pkg.changes
cnf = Config()
elif answer == 'E' and not Options["Trainee"]:
new = edit_overrides (new, upload, session)
elif answer == 'M' and not Options["Trainee"]:
+ upload.pkg.remove_known_changes()
aborted = upload.do_reject(manual=1,
reject_message=Options["Manual-Reject"],
note=get_new_comments(changes.get("source", ""), session=session))
if not aborted:
Logger.log(["NEW REJECT: %s" % (upload.pkg.changes_file)])
- os.unlink(upload.pkg.changes_file[:-8]+".dak")
done = 1
elif answer == 'N':
edit_note(get_new_comments(changes.get("source", ""), session=session),
elif answer == 'M':
Logger.log(["BYHAND REJECT: %s" % (upload.pkg.changes_file)])
upload.do_reject(manual=1, reject_message=Options["Manual-Reject"])
- os.unlink(upload.pkg.changes_file[:-8]+".dak")
done = 1
elif answer == 'S':
done = 1
finally:
os.unlink(path)
+def move_file_to_queue(to_q, f, session):
+ """mark a file as being in the unchecked queue"""
+ # update the queue_file entry for the existing queue
+ qf = session.query(QueueFile).filter_by(queueid=to_q.queueid,
+ filename=f.filename)
+ qf.queue = to_q
+
+ # update the changes_pending_files row
+ f.queue = to_q
+
+def changes_to_unchecked(changes, session):
+ """move a changes file to unchecked"""
+ unchecked = get_policy_queue('unchecked', session );
+ changes.in_queue = unchecked
+
+ for f in changes.pkg.files:
+ move_file_to_queue(unchecked, f)
+
+ # actually move files
+ changes.move_to_queue(unchecked)
+
def _accept(upload):
if Options["No-Action"]:
return
(summary, short_summary) = upload.build_summaries()
- upload.accept(summary, short_summary, targetdir=Config()["Dir::Queue::Newstage"])
- os.unlink(upload.pkg.changes_file[:-8]+".dak")
+# upload.accept(summary, short_summary, targetqueue)
+# os.unlink(upload.pkg.changes_file[:-8]+".dak")
+ changes_to_unchecked(upload)
def do_accept(upload):
print "ACCEPT"
if cnf.FindB("Dinstall::SecurityQueueHandling"):
upload.dump_vars(cnf["Dir::Queue::Embargoed"])
- upload.move_to_dir(cnf["Dir::Queue::Embargoed"])
+ upload.move_to_queue(get_policy_queue('embargoed'))
upload.queue_build("embargoed", cnf["Dir::Queue::Embargoed"])
# Check for override disparities
upload.Subst["__SUMMARY__"] = summary
_accept(upload)
def do_pkg(changes_file, session):
+ new_queue = get_policy_queue('new', session );
u = Upload()
- u.pkg.load_dot_dak(changes_file)
+ u.pkg.changes_file = changes_file
+ (u.pkg.changes["fingerprint"], rejects) = utils.check_signature(changes_file)
+ u.load_changes(changes_file)
+ u.pkg.directory = new_queue.path
u.update_subst()
+ u.logger = Logger
+ origchanges = os.path.abspath(u.pkg.changes_file)
cnf = Config()
bcc = "X-DAK: dak process-new"
u.Subst["__BCC__"] = bcc
files = u.pkg.files
+ for deb_filename, f in files.items():
+ package = re_package.sub(r'\1', deb_filename)
+ files[deb_filename]["package"] = package
+
+ if deb_filename.endswith(".udeb"):
+ files[deb_filename]["dbtype"] = "udeb"
+ elif deb_filename.endswith(".deb"):
+ files[deb_filename]["dbtype"] = "deb"
+ else:
+ m = re_issource.match(deb_filename)
+ if not m:
+ continue
+ files[deb_filename]["package"] = m.group(1)
+ files[deb_filename]["version"] = m.group(2)
+ files[deb_filename]["type"] = m.group(3)
+
+ files[deb_filename]["type"] = get_type(f, session)
+ entry = files[deb_filename]
+
+ # Version and file overwrite checks
+ if entry["type"] == "deb":
+ u.check_binary_against_db(deb_filename, session)
+ elif entry["type"] == "dsc":
+ u.check_source_against_db(deb_filename, session)
+ u.check_dsc_against_db(dsc_filename, session)
try:
with lock_package(u.pkg.changes["source"]):
if not recheck(u, session):
return
- (new, byhand) = check_status(files)
- if new or byhand:
- if new:
- do_new(u, session)
- if byhand:
- do_byhand(u, session)
- (new, byhand) = check_status(files)
-
- if not new and not byhand:
- try:
- check_daily_lock()
- do_accept(u)
- except CantGetLockError:
- print "Hello? Operator! Give me the number for 911!"
- print "Dinstall in the locked area, cant process packages, come back later"
+ # FIXME: This does need byhand checks added!
+ print "files is %s" % (u.pkg.files)
+ print "changes is %s" % (u.pkg.changes)
+ new = determine_new(u.pkg.changes, files)
+ if new:
+ do_new(u, session)
+ else:
+ do_accept(u)
+# (new, byhand) = check_status(files)
+# if new or byhand:
+# if new:
+# do_new(u, session)
+# if byhand:
+# do_byhand(u, session)
+# (new, byhand) = check_status(files)
+
+# if not new and not byhand:
+# try:
+# check_daily_lock()
+# do_accept(u)
+# except CantGetLockError:
+# print "Hello? Operator! Give me the number for 911!"
+# print "Dinstall in the locked area, cant process packages, come back later"
except AlreadyLockedError, e:
print "Seems to be locked by %s already, skipping..." % (e)
changes_files = apt_pkg.ParseCommandLine(cnf.Cnf,Arguments,sys.argv)
if len(changes_files) == 0:
- changes_files = utils.get_changes_files(cnf["Dir::Queue::New"])
+ new_queue = get_policy_queue('new', session );
+ changes_files = utils.get_changes_files(new_queue.path)
Options = cnf.SubTree("Process-New::Options")
projects / dak.git / blobdiff