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"]))
################################################################################
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 ?"
while prompt.find(answer) == -1:
- try:
- answer = utils.our_raw_input(prompt)
- except IOError, e:
- if e.errno == errno.EPIPE:
- utils.warn("[process_new] Caught EPIPE; skipping.")
- pass
- else:
- raise
+ answer = utils.our_raw_input(prompt)
m = re_default_answer.search(prompt)
if answer == "":
answer = m.group(1)
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
# 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."
+ _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"