From: Chris Lamb Date: Thu, 29 Oct 2009 13:42:45 +0000 (+0000) Subject: Cleanup any symlinks that we created. X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17cc832bee22911a8649edad6a5eb171e8aae110;p=dak Cleanup any symlinks that we created. Signed-off-by: Chris Lamb --- diff --git a/daklib/queue.py b/daklib/queue.py index f64e8ae6..1c3afffd 100755 --- a/daklib/queue.py +++ b/daklib/queue.py @@ -1211,6 +1211,7 @@ class Upload(object): # 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 +1232,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() @@ -1304,8 +1309,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:] "))