Merge branch 'master' into content_generation

diff --git a/config/debian/cron.dinstall b/config/debian/cron.dinstall
index 7c3880806878c609da809e8149c75ad535fe6bef..babef86a1a9a6f17a112eaed3428a20be5b29aa5 100755 (executable)
--- a/config/debian/cron.dinstall
+++ b/config/debian/cron.dinstall
@@ -67,6 +67,10 @@ function cleanup() {
        rm -f ${LOCK_ACCEPTED}
 }
 
+########################################################################
+# the actual dinstall functions follow                                 #
+########################################################################
+
 # Setup the notice file to tell bad mirrors they used the wrong time
 function notice() {
     rm -f "$NOTICE"
@@ -340,7 +344,27 @@ function compress() {
 }
 
 function logstats() {
-    $masterdir/tools/logs.py "$LOGFILE"
+    $masterdir/tools/logs.py "$1"
+}
+
+# save timestamp when we start
+function savetimestamp() {
+       NOW=`date "+%Y.%m.%d-%H:%M:%S"`
+       echo ${NOW} > "${dbdir}/dinstallstart"
+}
+
+function renamelogfile() {
+       if [ -f "${dbdir}/dinstallstart" ]; then
+               RENAMETO=$(cat "${dbdir}/dinstallstart")
+               mv "$LOGFILE" "$logdir/dinstall_${RENAMETO}.log"
+               logstats "$logdir/dinstall_${RENAMETO}.log"
+               bzip2 -9 "$logdir/dinstall_${RENAMETO}.log"
+       else
+               error "Problem, I don't know when dinstall started, unable to do log statistics."
+               NOW=`date "+%Y.%m.%d-%H:%M:%S"`
+               mv "$LOGFILE" "$logdir/dinstall_${NOW}.log"
+               bzip2 -9 "$logdir/dinstall_${NOW}.log"
+       fi
 }
 
 ########################################################################
@@ -464,6 +488,14 @@ trap cleanup EXIT ERR TERM HUP INT QUIT
 
 touch "${LOCK_BRITNEY}"
 
+GO=(
+    FUNC="savetimestamp"
+    TIME=""
+    ARGS=""
+    ERR="false"
+)
+stage $GO
+
 GO=(
     FUNC="notice"
     TIME=""
@@ -737,17 +769,16 @@ log "Daily cron scripts successful, all done"
 
 exec > /dev/null 2>&1
 
+cat "$LOGFILE" | mail -s "Log for dinstall run of ${NOW}" cron@ftp-master.debian.org
+
 GO=(
-    FUNC="logstats"
+    FUNC="renamelogfile"
     TIME=""
     ARGS=""
-    ERR=""
+    ERR="false"
 )
 stage $GO
 
-cat "$LOGFILE" | mail -s "Log for dinstall run of ${NOW}" cron@ftp-master.debian.org
-
-savelog -c ${LOGROTATE} -j "$LOGFILE"
 
 # Now, at the very (successful) end of dinstall, make sure we remove
 # our stage files, so the next dinstall run will do it all again.

diff --git a/dak/control_overrides.py b/dak/control_overrides.py
index 730ce25222a57e58becc379cd3d0e30752d1ca78..1add8f5b7627060fa3d9ef2f65937f6d050ee536 100755 (executable)
--- a/dak/control_overrides.py
+++ b/dak/control_overrides.py
@@ -77,16 +77,18 @@ def usage (exit_code=0):
 
   -a, --add                add overrides (changes and deletions are ignored)
   -S, --set                set overrides
+  -C, --change             change overrides (additions and deletions are ignored)
   -l, --list               list overrides
 
   -q, --quiet              be less verbose
+  -n, --no-action          only list the action that would have been done
 
  starred (*) values are default"""
     sys.exit(exit_code)
 
 ################################################################################
 
-def process_file (file, suite, component, type, action):
+def process_file (file, suite, component, type, action, noaction=0):
     suite_id = database.get_suite_id(suite)
     if suite_id == -1:
         utils.fubar("Suite '%s' not recognised." % (suite))
@@ -117,13 +119,14 @@ def process_file (file, suite, component, type, action):
         original[i[0]] = i[1:]
 
     start_time = time.time()
-    projectB.query("BEGIN WORK")
+    if not noaction:
+        projectB.query("BEGIN WORK")
     for line in file.readlines():
         line = re_comments.sub('', line).strip()
         if line == "":
             continue
 
-        maintainer_override = None
+        maintainer_override = ""
         if type == "dsc":
             split_line = line.split(None, 2)
             if len(split_line) == 2:
@@ -166,8 +169,7 @@ def process_file (file, suite, component, type, action):
             (old_priority_id, old_section_id, old_maintainer_override, old_priority, old_section) = original[package]
             if action == "add" or old_priority_id == priority_id and \
                old_section_id == section_id and \
-               ((old_maintainer_override == maintainer_override) or \
-                (old_maintainer_override == "" and maintainer_override == None)):
+               old_maintainer_override == maintainer_override:
                 # If it's unchanged or we're in 'add only' mode, ignore it
                 c_skipped += 1
                 continue
@@ -175,8 +177,9 @@ def process_file (file, suite, component, type, action):
                 # If it's changed, delete the old one so we can
                 # reinsert it with the new information
                 c_updated += 1
-                projectB.query("DELETE FROM override WHERE suite = %s AND component = %s AND package = '%s' AND type = %s"
-                               % (suite_id, component_id, package, type_id))
+                if not noaction:
+                    projectB.query("DELETE FROM override WHERE suite = %s AND component = %s AND package = '%s' AND type = %s"
+                                   % (suite_id, component_id, package, type_id))
                 # Log changes
                 if old_priority_id != priority_id:
                     Logger.log(["changed priority",package,old_priority,priority])
@@ -185,30 +188,37 @@ def process_file (file, suite, component, type, action):
                 if old_maintainer_override != maintainer_override:
                     Logger.log(["changed maintainer override",package,old_maintainer_override,maintainer_override])
                 update_p = 1
+        elif action == "change":
+            # Ignore additions in 'change only' mode
+            c_skipped += 1
+            continue
         else:
             c_added += 1
             update_p = 0
 
-        if maintainer_override:
-            projectB.query("INSERT INTO override (suite, component, type, package, priority, section, maintainer) VALUES (%s, %s, %s, '%s', %s, %s, '%s')"
-                           % (suite_id, component_id, type_id, package, priority_id, section_id, maintainer_override))
-        else:
-            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, package, priority_id, section_id))
+        if not noaction:
+            if maintainer_override:
+                projectB.query("INSERT INTO override (suite, component, type, package, priority, section, maintainer) VALUES (%s, %s, %s, '%s', %s, %s, '%s')"
+                               % (suite_id, component_id, type_id, package, priority_id, section_id, maintainer_override))
+            else:
+                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, package, priority_id, section_id))
 
         if not update_p:
             Logger.log(["new override",suite,component,type,package,priority,section,maintainer_override])
 
-    if not action == "add":
+    if action == "set":
         # Delete any packages which were removed
         for package in original.keys():
             if not new.has_key(package):
-                projectB.query("DELETE FROM override WHERE suite = %s AND component = %s AND package = '%s' AND type = %s"
-                               % (suite_id, component_id, package, type_id))
+                if not noaction:
+                    projectB.query("DELETE FROM override WHERE suite = %s AND component = %s AND package = '%s' AND type = %s"
+                                   % (suite_id, component_id, package, type_id))
                 c_removed += 1
                 Logger.log(["removed override",suite,component,type,package])
 
-    projectB.query("COMMIT WORK")
+    if not noaction:
+        projectB.query("COMMIT WORK")
     if not Cnf["Control-Overrides::Options::Quiet"]:
         print "Done in %d seconds. [Updated = %d, Added = %d, Removed = %d, Skipped = %d, Errors = %d]" % (int(time.time()-start_time), c_updated, c_added, c_removed, c_skipped, c_error)
     Logger.log(["set complete",c_updated, c_added, c_removed, c_skipped, c_error])
@@ -250,10 +260,12 @@ def main ():
                  ('q', "quiet", "Control-Overrides::Options::Quiet"),
                  ('s', "suite", "Control-Overrides::Options::Suite", "HasArg"),
                  ('S', "set", "Control-Overrides::Options::Set"),
+                 ('C', "change", "Control-Overrides::Options::Change"),
+                 ('n', "no-action", "Control-Overrides::Options::No-Action"),
                  ('t', "type", "Control-Overrides::Options::Type", "HasArg")]
 
     # Default arguments
-    for i in [ "add", "help", "list", "quiet", "set" ]:
+    for i in [ "add", "help", "list", "quiet", "set", "change", "no-action" ]:
         if not Cnf.has_key("Control-Overrides::Options::%s" % (i)):
             Cnf["Control-Overrides::Options::%s" % (i)] = ""
     if not Cnf.has_key("Control-Overrides::Options::Component"):
@@ -272,7 +284,7 @@ def main ():
     database.init(Cnf, projectB)
 
     action = None
-    for i in [ "add", "list", "set" ]:
+    for i in [ "add", "list", "set", "change" ]:
         if Cnf["Control-Overrides::Options::%s" % (i)]:
             if action:
                 utils.fubar("Can not perform more than one action at once.")
@@ -288,12 +300,17 @@ def main ():
         if Cnf.has_key("Suite::%s::Untouchable" % suite) and Cnf["Suite::%s::Untouchable" % suite] != 0:
             utils.fubar("%s: suite is untouchable" % suite)
 
-        Logger = logging.Logger(Cnf, "control-overrides")
+        noaction = 0
+        if Cnf["Control-Overrides::Options::No-Action"]:
+            utils.warn("In No-Action Mode")
+            noaction = 1
+
+        Logger = logging.Logger(Cnf, "control-overrides", noaction)
         if file_list:
             for f in file_list:
-                process_file(utils.open_file(f), suite, component, otype, action)
+                process_file(utils.open_file(f), suite, component, otype, action, noaction)
         else:
-            process_file(sys.stdin, suite, component, otype, action)
+            process_file(sys.stdin, suite, component, otype, action, noaction)
         Logger.close()
 
 #######################################################################################