Mercurial > dtrx / changeset

--- a/TODO	Thu Jul 10 19:51:53 2008 -0400
+++ b/TODO	Thu Jul 10 20:09:12 2008 -0400
@@ -2,11 +2,8 @@
 
 To do:
 
-* Everything is messed up when an archive contains one file.
-
-* When we list how many archives are in the file, show a count, along with
-  the number of regular files in the archive too.  "foo.tar contains 5
-  other archives, out of 81 files total."
+* Everything is messed up when an archive contains one file... but I forget
+  what I meant by this.
 
 * When we extract a compressed file (or just one file?), check to see if it
   itself is an archive.  Follow all the usual rules for recursive

--- a/scripts/dtrx	Thu Jul 10 19:51:53 2008 -0400
+++ b/scripts/dtrx	Thu Jul 10 20:09:12 2008 -0400
@@ -686,7 +686,7 @@
             self.current_policy = self.permanent_policy or RECURSE_NOT_NOW
             return
         question = (("%s contains %s other archive file(s), " +
-                     "out of %s files total.") %
+                     "out of %s file(s) total.") %
                     (current_filename, archive_count, extractor.file_count))
         question = textwrap.wrap(question)
         if target == '.':

--- a/tests/tests.yml	Thu Jul 10 19:51:53 2008 -0400
+++ b/tests/tests.yml	Thu Jul 10 20:09:12 2008 -0400
@@ -415,7 +415,7 @@
   input: |
     h
     o
-  grep: "contains 2 other archive file\(s\), out of 2 files"
+  grep: "contains 2 other archive file\(s\), out of 2 file\(s\)"
   baseline: |
     tar -xf $1
     cd subdir