merge extractor contents bugfix trunk

Sun, 19 Oct 2008 22:53:32 -0400

author
Brett Smith <brettcsmith@brettcsmith.org>
date
Sun, 19 Oct 2008 22:53:32 -0400
branch
trunk
changeset 96
4921c8e3c3f5
parent 95
4f7d3ccecf32 (current diff)
parent 91
ececf7836546 (diff)
child 97
0ebcdd6512ac

merge extractor contents bugfix

scripts/dtrx file | annotate | diff | comparison | revisions
--- a/scripts/dtrx	Sun Oct 19 22:50:47 2008 -0400
+++ b/scripts/dtrx	Sun Oct 19 22:53:32 2008 -0400
@@ -218,7 +218,6 @@
                     self.included_archives.append(os.path.join(path, filename))
 
     def check_contents(self):
-        self.contents = os.listdir('.')
         if not self.contents:
             self.content_type = EMPTY
         elif len(self.contents) == 1:
@@ -275,6 +274,7 @@
         try:
             self.archive.seek(0, 0)
             self.extract_archive()
+            self.contents = os.listdir('.')
             self.check_contents()
             self.check_success(self.content_type != EMPTY)
         except EXTRACTION_ERRORS:

mercurial