From 141673ae65e8160c78464c1eac1ecb615aedfc54 Mon Sep 17 00:00:00 2001 From: James Troup Date: Wed, 14 Feb 2007 22:13:39 +0000 Subject: [PATCH] Remove code to handle bug closures differently for NMUs or experimental uploads and just let version tracking sort it out instead. --- ChangeLog | 13 ++++ config/debian-non-US/dak.conf | 1 - config/debian-security/dak.conf | 1 - config/debian/dak.conf | 1 - daklib/queue.py | 103 +++++--------------------------- docs/README.config | 5 -- 6 files changed, 27 insertions(+), 97 deletions(-) diff --git a/ChangeLog b/ChangeLog index d934ff46..f81d8123 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2007-02-14 James Troup + + * docs/README.config: remove Dinstall::GroupOverrideFilename. + * config/debian/dak.conf: likewise. + * config/debian-non-US/dak.conf: likewise. + * config/debian-security/dak.conf: likewise. + + * daklib/queue.py (Upload.close_bugs): no longer handle NMUs or + experimental differently, just close the bugs and let version + tracking sort it out. + (nmu_p): remove entire class - now unused. + (Upload.__init__): don't use nmu_p. + 2007-02-08 Anthony Towns * config/debian/dak.conf: update for 3.1r4. Use new 'etch' diff --git a/config/debian-non-US/dak.conf b/config/debian-non-US/dak.conf index 363eed2f..2c14c7db 100644 --- a/config/debian-non-US/dak.conf +++ b/config/debian-non-US/dak.conf @@ -15,7 +15,6 @@ Dinstall TrackingServer "packages.qa.debian.org"; LockFile "/org/non-us.debian.org/dak/lock"; Bcc "archive@ftp-master.debian.org"; - GroupOverrideFilename "override.group-maint"; FutureTimeTravelGrace 28800; // 8 hours PastCutoffYear "1984"; SkipTime 300; diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf index 3462467b..b146c637 100644 --- a/config/debian-security/dak.conf +++ b/config/debian-security/dak.conf @@ -14,7 +14,6 @@ Dinstall PackagesServer "packages.debian.org"; LockFile "/org/security.debian.org/dak/lock"; Bcc "archive@ftp-master.debian.org"; - // GroupOverrideFilename "override.group-maint"; FutureTimeTravelGrace 28800; // 8 hours PastCutoffYear "1984"; SkipTime 300; diff --git a/config/debian/dak.conf b/config/debian/dak.conf index 1dc7c74c..b6e816c9 100644 --- a/config/debian/dak.conf +++ b/config/debian/dak.conf @@ -15,7 +15,6 @@ Dinstall TrackingServer "packages.qa.debian.org"; LockFile "/srv/ftp.debian.org/lock/dinstall.lock"; Bcc "archive@ftp-master.debian.org"; - GroupOverrideFilename "override.group-maint"; FutureTimeTravelGrace 28800; // 8 hours PastCutoffYear "1984"; SkipTime 300; diff --git a/daklib/queue.py b/daklib/queue.py index e1b50b2f..2149dff3 100644 --- a/daklib/queue.py +++ b/daklib/queue.py @@ -45,56 +45,10 @@ class Pkg: ############################################################################### -class nmu_p: - # Read in the group maintainer override file - def __init__ (self, Cnf): - self.group_maint = {} - self.Cnf = Cnf - if Cnf.get("Dinstall::GroupOverrideFilename"): - filename = Cnf["Dir::Override"] + Cnf["Dinstall::GroupOverrideFilename"] - file = utils.open_file(filename) - for line in file.readlines(): - line = utils.re_comments.sub('', line).lower().strip() - if line != "": - self.group_maint[line] = 1 - file.close() - - def is_an_nmu (self, pkg): - Cnf = self.Cnf - changes = pkg.changes - dsc = pkg.dsc - - i = utils.fix_maintainer (dsc.get("maintainer", - Cnf["Dinstall::MyEmailAddress"]).lower()) - (dsc_rfc822, dsc_rfc2047, dsc_name, dsc_email) = i - # changes["changedbyname"] == dsc_name is probably never true, but better safe than sorry - if dsc_name == changes["maintainername"].lower() and \ - (changes["changedby822"] == "" or changes["changedbyname"].lower() == dsc_name): - return 0 - - if dsc.has_key("uploaders"): - uploaders = dsc["uploaders"].lower().split(",") - uploadernames = {} - for i in uploaders: - (rfc822, rfc2047, name, email) = utils.fix_maintainer (i.strip()) - uploadernames[name] = "" - if uploadernames.has_key(changes["changedbyname"].lower()): - return 0 - - # Some group maintained packages (e.g. Debian QA) are never NMU's - if self.group_maint.has_key(changes["maintaineremail"].lower()): - return 0 - - return 1 - -############################################################################### - class Upload: def __init__(self, Cnf): self.Cnf = Cnf - # Read in the group-maint override file - self.nmu = nmu_p(Cnf) self.accept_count = 0 self.accept_bytes = 0L self.pkg = Pkg(changes = {}, dsc = {}, dsc_files = {}, files = {}, @@ -308,55 +262,26 @@ class Upload: return summary bugs.sort() - if not self.nmu.is_an_nmu(self.pkg): - if changes["distribution"].has_key("experimental"): - # tag bugs as fixed-in-experimental for uploads to experimental - summary += "Setting bugs to severity fixed: " - control_message = "" - for bug in bugs: - summary += "%s " % (bug) - control_message += "tag %s + fixed-in-experimental\n" % (bug) - if action and control_message != "": - Subst["__CONTROL_MESSAGE__"] = control_message - mail_message = utils.TemplateSubst(Subst,Cnf["Dir::Templates"]+"/process-unchecked.bug-experimental-fixed") - utils.send_mail (mail_message) - if action: - self.Logger.log(["setting bugs to fixed"]+bugs) - - - else: - summary += "Closing bugs: " - for bug in bugs: - summary += "%s " % (bug) - if action: - Subst["__BUG_NUMBER__"] = bug - if changes["distribution"].has_key("stable"): - Subst["__STABLE_WARNING__"] = """ + summary += "Closing bugs: " + for bug in bugs: + summary += "%s " % (bug) + if action: + Subst["__BUG_NUMBER__"] = bug + if changes["distribution"].has_key("stable"): + Subst["__STABLE_WARNING__"] = """ Note that this package is not part of the released stable Debian distribution. It may have dependencies on other unreleased software, or other instabilities. Please take care if you wish to install it. The update will eventually make its way into the next released Debian distribution.""" - else: - Subst["__STABLE_WARNING__"] = "" - mail_message = utils.TemplateSubst(Subst,Cnf["Dir::Templates"]+"/process-unchecked.bug-close") - utils.send_mail (mail_message) - if action: - self.Logger.log(["closing bugs"]+bugs) - - else: # NMU - summary += "Setting bugs to severity fixed: " - control_message = "" - for bug in bugs: - summary += "%s " % (bug) - control_message += "tag %s + fixed\n" % (bug) - if action and control_message != "": - Subst["__CONTROL_MESSAGE__"] = control_message - mail_message = utils.TemplateSubst(Subst,Cnf["Dir::Templates"]+"/process-unchecked.bug-nmu-fixed") - utils.send_mail (mail_message) - if action: - self.Logger.log(["setting bugs to fixed"]+bugs) + else: + Subst["__STABLE_WARNING__"] = "" + mail_message = utils.TemplateSubst(Subst,Cnf["Dir::Templates"]+"/process-unchecked.bug-close") + utils.send_mail (mail_message) + if action: + self.Logger.log(["closing bugs"]+bugs) summary += "\n" + return summary ########################################################################### diff --git a/docs/README.config b/docs/README.config index 52588bdc..29749f65 100644 --- a/docs/README.config +++ b/docs/README.config @@ -213,7 +213,6 @@ Mandatory. List of dinstall options, e.g.: | TrackingServer "packages.qa.debian.org"; | LockFile "/org/ftp.debian.org/dak/lock"; | Bcc "archive@ftp-master.debian.org"; -| GroupOverrideFilename "override.group-maint"; | FutureTimeTravelGrace 28800; // 8 hours | PastCutoffYear "1984"; | BXANotify "false"; @@ -255,10 +254,6 @@ when in action mode (i.e. not using -n/--no-action). All sent mail is blind carbon copied to the email address in Bcc if it's not blank. -GroupOverrideFilename (optional): this is the override file which contains -the list of email addresses which, if part of the Maintainer field, cause -uploads to always be treated as maintainer uploads. - FutureTimeTravelGrace (required): specifies how many seconds into the future timestamps are allowed to be inside a deb before being rejected. -- 2.39.5