提交 17cc832b 编写于 作者: C Chris Lamb

Cleanup any symlinks that we created.

Signed-off-by: NChris Lamb <lamby@debian.org>
上级 c629ed1c
......@@ -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:] "))
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册