From: James Troup <james@nocrew.org>
Date: Wed, 26 Sep 2001 03:15:16 +0000 (+0000)
Subject: whitespace
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=2640ce213afbd93f01d6cab41d903db852b7f5bf;p=dak.git

whitespace
---

diff --git a/melanie b/melanie
index 5a5a2058..3dfae76d 100755
--- a/melanie
+++ b/melanie
@@ -2,7 +2,7 @@
 
 # General purpose archive tool for ftpmaster
 # Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
-# $Id: melanie,v 1.15 2001-08-11 22:04:27 rmurray Exp $
+# $Id: melanie,v 1.16 2001-09-26 03:15:16 troup Exp $
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -71,7 +71,7 @@ def main ():
     global Cnf, projectB;
 
     apt_pkg.init();
-    
+
     Cnf = apt_pkg.newConfiguration();
     apt_pkg.ReadConfigFileISC(Cnf,utils.which_conf_file());
 
@@ -149,7 +149,7 @@ def main ():
     suite_ids_list = [];
     con_suites = "AND (";
     for suite in string.split(Options["Suite"]):
-        
+
         if not Options["No-Action"] and suite == "stable":
             print "**WARNING** About to remove from the stable suite!"
             print "This should only be done just prior to a (point) release and not at"
@@ -160,7 +160,7 @@ def main ():
             print "There's no need to do this normally as removals from unstable will"
             print "propogate to testing automagically."
             game_over();
-            
+
         suite_id = db_access.get_suite_id(suite);
         if suite_id == -1:
             utils.warn("suite '%s' not recognised." % (suite));
@@ -185,7 +185,7 @@ def main ():
         con_components = con_components[:-3] + ")"
         over_con_components = over_con_components[:-3] + ")";
     else:
-        con_components = "";    
+        con_components = "";
         over_con_components = "";
 
     if Options["Architecture"]:
@@ -319,7 +319,7 @@ def main ():
     # If -n/--no-action, drop out here
     if Options["No-Action"]:
         sys.exit(0);
-        
+
     game_over();
 
     whoami = utils.whoami();
@@ -335,10 +335,10 @@ def main ():
     logfile.write("\n------------------- Reason -------------------\n%s\n" % (Options["Reason"]));
     logfile.write("----------------------------------------------\n");
     logfile.flush();
-        
+
     dsc_type_id = db_access.get_override_type_id('dsc');
     deb_type_id = db_access.get_override_type_id('deb');
-    
+
     # Do the actual deletion
     print "Deleting...",
     sys.stdout.flush();
@@ -379,7 +379,7 @@ def main ():
         else:
             bcc = "Bcc: " + bcc;
         Subst["__BCC__"] = bcc[:-2];
-        Subst["__CC__"] = "X-Melanie: $Revision: 1.15 $\n" + carbon_copy[:-1];
+        Subst["__CC__"] = "X-Melanie: $Revision: 1.16 $\n" + carbon_copy[:-1];
         Subst["__SUITE_LIST__"] = suites_list;
         Subst["__SUMMARY__"] = summary;
         Subst["__ADMIN_ADDRESS__"] = Cnf["Dinstall::MyAdminAddress"];
@@ -393,7 +393,7 @@ def main ():
             Subst["__BUG_NUMBER__"] = bug;
             mail_message = utils.TemplateSubst(Subst,open(Cnf["Dir::TemplatesDir"]+"/melanie.bug-close","r").read());
             utils.send_mail (mail_message, "")
-            
+
     logfile.write("=========================================================================\n");
     logfile.close();