Code cleanup.

This commit is contained in:
Bastian Kleineidam 2012-05-25 15:01:33 +02:00
parent 8ed2392f46
commit c5f1dc543b
1 changed files with 2 additions and 5 deletions

View File

@ -359,14 +359,11 @@ def stripext (filename):
def get_single_outfile (directory, archive, extension=""): def get_single_outfile (directory, archive, extension=""):
"""Get output filename if archive is in a single file format like gzip.""" """Get output filename if archive is in a single file format like gzip."""
outfile = os.path.join(directory, stripext(archive)) outfile = os.path.join(directory, stripext(archive))
if is_same_filename(archive, outfile): if os.path.exists(outfile + extension):
# prevent overwriting the archive itself
extension = ".raw"
if os.path.exists(outfile+extension):
# prevent overwriting existing files # prevent overwriting existing files
i = 1 i = 1
newfile = "%s%d" % (outfile, i) newfile = "%s%d" % (outfile, i)
while os.path.exists(newfile+extension): while os.path.exists(newfile + extension):
newfile = "%s%d" % (outfile, i) newfile = "%s%d" % (outfile, i)
i += 1 i += 1
outfile = newfile outfile = newfile