# HG changeset patch
# User Brett Smith <brettcsmith@brettcsmith.org>
# Date 1224471212 14400
# Node ID 4921c8e3c3f5457676c34a81eabfe3e8c6b52b2b
# Parent  4f7d3ccecf3218435be322d813e87babb4c5a0d6# Parent  ececf78365468bbb555e984096ef750fb8e65acc
merge extractor contents bugfix

diff -r 4f7d3ccecf32 -r 4921c8e3c3f5 scripts/dtrx
--- 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: