X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fprocess_unchecked.py;h=fafff7baff5060436c87a155a6456ede46a5e642;hb=782339bc8e1a2e17b9e6b3009b22b5efa74218f7;hp=0eec1ee80d7c537a307192ea181b4787a13bf53f;hpb=3045fc0a7b134eb014533c56fd37d6cace2aa2d5;p=dak.git

diff --git a/dak/process_unchecked.py b/dak/process_unchecked.py
index 0eec1ee8..fafff7ba 100755
--- a/dak/process_unchecked.py
+++ b/dak/process_unchecked.py
@@ -124,6 +124,7 @@ def usage (exit_code=0):
 
 def action(u):
     cnf = Config()
+
     # changes["distribution"] may not exist in corner cases
     # (e.g. unreadable changes files)
     if not u.pkg.changes.has_key("distribution") or not isinstance(u.pkg.changes["distribution"], DictType):
@@ -426,6 +427,7 @@ def acknowledge_new(u, summary, short_summary):
     if not Options["No-Mail"]:
         print "Sending new ack."
         template = os.path.join(cnf["Dir::Templates"], 'process-unchecked.new')
+        u.update_subst()
         u.Subst["__SUMMARY__"] = summary
         new_ack_message = utils.TemplateSubst(u.Subst, template)
         utils.send_mail(new_ack_message)
@@ -452,6 +454,7 @@ def process_it(changes_file):
     u.pkg.changes_file = changes_file
     u.pkg.directory = os.getcwd()
     u.logger = Logger
+    origchanges = os.path.join(u.pkg.directory, u.pkg.changes_file)
 
     # Some defaults in case we can't fully process the .changes file
     u.pkg.changes["maintainer2047"] = cnf["Dinstall::MyEmailAddress"]
@@ -481,7 +484,7 @@ def process_it(changes_file):
 
             # Absolutize the filename to avoid the requirement of being in the
             # same directory as the .changes file.
-            holding.copy_to_holding(os.path.abspath(changes_file))
+            holding.copy_to_holding(origchanges)
 
             # Relativize the filename so we use the copy in holding
             # rather than the original...
@@ -493,7 +496,7 @@ def process_it(changes_file):
             valid_changes_p = u.load_changes(changespath)
         else:
             valid_changes_p = False
-	    u.rejects.extend(rejects)
+            u.rejects.extend(rejects)
 
         if valid_changes_p:
             while u.reprocess: