import pwd
import apt_pkg, apt_inst
import examine_package
+
from daklib import database
-from daklib import logging
+from daklib import daklog
from daklib import queue
from daklib import utils
from daklib.regexes import re_no_epoch, re_default_answer, re_isanum
from daklib.dak_exceptions import CantOpenError, AlreadyLockedError, CantGetLockError
+from daklib.summarystats import SummaryStats
# Globals
Cnf = None #: Configuration, apt_pkg.Configuration
mtime = os.stat(d["filename"])[stat.ST_MTIME]
if mtime < oldest:
oldest = mtime
- have_note += (database.has_new_comment(d["source"], d["version"]))
+ have_note += (database.has_new_comment(d["source"], d["version"], True))
per_source[source]["oldest"] = oldest
if not have_note:
per_source[source]["note_state"] = 0; # none
elif answer == 'Q':
end()
sys.exit(0)
- database.add_new_comment(Upload.pkg.changes["source"], Upload.pkg.changes["version"], newnote, utils.whoami())
+
+ database.add_new_comment(Upload.pkg.changes["source"], Upload.pkg.changes["version"], newnote, utils.whoami(), bool(Options["Trainee"]))
################################################################################
def add_overrides (new):
changes = Upload.pkg.changes
files = Upload.pkg.files
+ srcpkg = changes.get("source")
projectB.query("BEGIN WORK")
for suite in changes["suite"].keys():
type_id = database.get_override_type_id(new[pkg]["type"])
priority_id = new[pkg]["priority id"]
section_id = new[pkg]["section id"]
+ Logger.log(["%s overrides" % (srcpkg), suite, new[pkg]["component"], new[pkg]["type"], new[pkg]["priority"], new[pkg]["section"]])
projectB.query("INSERT INTO override (suite, component, type, package, priority, section, maintainer) VALUES (%s, %s, %s, '%s', %s, %s, '')" % (suite_id, component_id, type_id, pkg, priority_id, section_id))
for f in new[pkg]["files"]:
if files[f].has_key("new"):
print "W: [!] marked entries must be fixed before package can be processed."
if note:
print "W: note must be removed before package can be processed."
- prompt += "Remove note, "
+ prompt += "RemOve all notes, Remove note, "
prompt += "Edit overrides, Check, Manual reject, Note edit, Prod, [S]kip, Quit ?"
try:
check_daily_lock()
done = add_overrides (new)
+ Logger.log([utils.getusername(), "NEW ACCEPT: %s" % (Upload.pkg.changes_file)])
except CantGetLockError:
print "Hello? Operator! Give me the number for 911!"
print "Dinstall in the locked area, cant process packages, come back later"
reject_message=Options["Manual-Reject"],
note=database.get_new_comments(changes.get("source", "")))
if not aborted:
+ Logger.log([utils.getusername(), "NEW REJECT: %s" % (Upload.pkg.changes_file)])
os.unlink(Upload.pkg.changes_file[:-8]+".dak")
done = 1
elif answer == 'N':
edit_note(database.get_new_comments(changes.get("source", "")))
elif answer == 'P' and not Options["Trainee"]:
prod_maintainer(database.get_new_comments(changes.get("source", "")))
+ Logger.log([utils.getusername(), "NEW PROD: %s" % (Upload.pkg.changes_file)])
elif answer == 'R' and not Options["Trainee"]:
confirm = utils.our_raw_input("Really clear note (y/N)? ").lower()
if confirm == "y":
database.delete_new_comments(changes.get("source"), changes.get("version"))
+ elif answer == 'O' and not Options["Trainee"]:
+ confirm = utils.our_raw_input("Really clear all notes (y/N)? ").lower()
+ if confirm == "y":
+ database.delete_all_new_comments(changes.get("source"))
elif answer == 'S':
done = 1
elif answer == 'Q':
if not Options["No-Action"]:
try:
- Logger = Upload.Logger = logging.Logger(Cnf, "process-new")
+ Logger = Upload.Logger = daklog.Logger(Cnf, "process-new")
except CantOpenError, e:
- Options["Trainee"] = "Oh yes"
+ Options["Trainee"] = "True"
projectB = Upload.projectB
done = 1
for f in byhand:
del files[f]
+ Logger.log([utils.getusername(), "BYHAND ACCEPT: %s" % (Upload.pkg.changes_file)])
except CantGetLockError:
print "Hello? Operator! Give me the number for 911!"
print "Dinstall in the locked area, cant process packages, come back later"
elif answer == 'M':
+ Logger.log([utils.getusername(), "BYHAND REJECT: %s" % (Upload.pkg.changes_file)])
Upload.do_reject(1, Options["Manual-Reject"])
os.unlink(Upload.pkg.changes_file[:-8]+".dak")
done = 1
# writing this means that it is installed, so put it into
# accepted.
print "Binary-only upload, source installed."
+ Logger.log([utils.getusername(), "PUNEW ACCEPT: %s" % (Upload.pkg.changes_file)])
_accept()
elif is_source_in_queue_dir(Cnf["Dir::Queue::Accepted"]):
# The source is in accepted, the binary cleared NEW: accept it.
print "Binary-only upload, source in accepted."
+ Logger.log([utils.getusername(), "PUNEW ACCEPT: %s" % (Upload.pkg.changes_file)])
_accept()
elif is_source_in_queue_dir(Cnf["Dir::Queue::New"]):
# It's in NEW. We expect the source to land in p-u holding
# pretty soon.
print "Binary-only upload, source in new."
move_to_holding(suite, queue_dir)
+ elif is_source_in_queue_dir(Cnf["Dir::Queue::Newstage"]):
+ # It's in newstage. Accept into the holding area
+ print "Binary-only upload, source in newstage."
+ Logger.log([utils.getusername(), "PUNEW ACCEPT: %s" % (Upload.pkg.changes_file)])
+ _accept()
else:
# No case applicable. Bail out. Return will cause the upload
# to be skipped.
################################################################################
def end():
- accept_count = Upload.accept_count
- accept_bytes = Upload.accept_bytes
+ accept_count = SummaryStats().accept_count
+ accept_bytes = SummaryStats().accept_bytes
if accept_count:
sets = "set"
if accept_count > 1:
sets = "sets"
sys.stderr.write("Accepted %d package %s, %s.\n" % (accept_count, sets, utils.size_type(int(accept_bytes))))
- Logger.log(["total",accept_count,accept_bytes])
+ Logger.log([utils.getusername(), "total",accept_count,accept_bytes])
if not Options["No-Action"] and not Options["Trainee"]:
Logger.close()
projects / dak.git / blobdiff