X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fqueue.py;h=8ab693a86e89bbe72c30916ace7916687c01ca75;hb=6794769445e4dab2f87a87137190b17af739e0c7;hp=f64e8ae6bd9f3501668f225de8a904fef80f2555;hpb=c629ed1c07ab3257926520c065bff763bb54f47d;p=dak.git

diff --git a/daklib/queue.py b/daklib/queue.py
index f64e8ae6..8ab693a8 100755
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -1209,8 +1209,14 @@ class Upload(object):
         if not valid_dist:
             return
 
+        tagfile = cnf.get("Dinstall::LintianTags")
+        if tagfile is None:
+            # We don't have a tagfile, so just don't do anything.
+            return
+
         # Try and find all orig mentioned in the .dsc
         target_dir = '.'
+        symlinked = []
         for filename, entry in self.pkg.dsc_files.iteritems():
             if not re_is_orig_source.match(filename):
                 # File is not an orig; ignore
@@ -1231,7 +1237,11 @@ class Upload(object):
                 if fingerprint != expected:
                     return False
 
-                os.symlink(path, os.path.join(target_dir, filename))
+                dest = os.path.join(target_dir, filename)
+
+                os.symlink(path, dest)
+                symlinked.append(dest)
+
                 return True
 
             session = DBConn().session()
@@ -1271,10 +1281,6 @@ class Upload(object):
                 if symlink_if_valid(queuefile_path):
                     break
 
-        tagfile = cnf.get("Dinstall::LintianTags")
-        if tagfile is None:
-            # We don't have a tagfile, so just don't do anything.
-            return
         # Parse the yaml file
         sourcefile = file(tagfile, 'r')
         sourcecontent = sourcefile.read()
@@ -1304,8 +1310,12 @@ class Upload(object):
         # to then parse it.
         command = "lintian --show-overrides --tags-from-file %s %s" % (temp_filename, self.pkg.changes_file)
         (result, output) = commands.getstatusoutput(command)
-        # We are done with lintian, remove our tempfile
+
+        # We are done with lintian, remove our tempfile and any symlinks we created
         os.unlink(temp_filename)
+        for symlink in symlinked:
+            os.unlink(symlink)
+
         if (result == 2):
             utils.warn("lintian failed for %s [return code: %s]." % (self.pkg.changes_file, result))
             utils.warn(utils.prefix_multi_line_string(output, " [possible output:] "))