Author: rra
Date: 2006-11-19 21:50:17 +0100 (Sun, 19 Nov 2006)
New Revision: 789

Modified:
   trunk/collection/file-info
   trunk/debian/changelog
   trunk/testset/filenames/debian/rules
Log:
* collection/file-info:
  + [RA] Unescape non-ASCII characters escaped by tar before running
    file on the resulting filename.  Otherwise, file can't find the
    file, exits with an error, and lintian aborts.  Reported by Bill
    Allombert.  (Closes: #399392)

Modified: trunk/collection/file-info
===================================================================
--- trunk/collection/file-info  2006-11-19 01:31:06 UTC (rev 788)
+++ trunk/collection/file-info  2006-11-19 20:50:17 UTC (rev 789)
@@ -44,7 +44,8 @@
     chop;
     $_ = (split(" ", $_, 6))[5];
     s/ link to .*//;
-    s/ -> .*//; 
+    s/ -> .*//;
+    s/(\G|[^\\](?:\\\\)*)\\(\d{3})/"$1" . chr(oct $2)/ge;
     s/\\\\/\\/;
     printf $XARGS "%s\0", $_;
 }

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog      2006-11-19 01:31:06 UTC (rev 788)
+++ trunk/debian/changelog      2006-11-19 20:50:17 UTC (rev 789)
@@ -1,3 +1,13 @@
+lintian (1.23.27) UNRELEASED; urgency=low
+
+  * collection/file-info:
+    + [RA] Unescape non-ASCII characters escaped by tar before running
+      file on the resulting filename.  Otherwise, file can't find the
+      file, exits with an error, and lintian aborts.  Reported by Bill
+      Allombert.  (Closes: #399392)
+
+ -- Russ Allbery <[EMAIL PROTECTED]>  Sun, 19 Nov 2006 12:30:28 -0800
+
 lintian (1.23.26) unstable; urgency=low
 
   * checks/binaries{.desc,}:

Modified: trunk/testset/filenames/debian/rules
===================================================================
--- trunk/testset/filenames/debian/rules        2006-11-19 01:31:06 UTC (rev 
788)
+++ trunk/testset/filenames/debian/rules        2006-11-19 20:50:17 UTC (rev 
789)
@@ -73,6 +73,13 @@
        install -d debian/tmp/usr/share/doc/filenames
        touch debian/tmp/usr/share/doc/filenames/README.macosx
 
+       echo foo > debian/tmp/usr/share/doc/filenames/bokmål
+       echo foo > debian/tmp/usr/share/doc/filenames/bokm\\ål
+       echo foo > debian/tmp/usr/share/doc/filenames/bokm\\\\ål
+       echo foo > debian/tmp/usr/share/doc/filenames/bokm�l
+       echo foo > debian/tmp/usr/share/doc/filenames/bokm\\�l
+       echo foo > debian/tmp/usr/share/doc/filenames/bokm\\\\�l
+
        install -d debian/tmp/usr/share/doc/filenames/examples
        touch debian/tmp/usr/share/doc/filenames/examples/__init__.py
        touch 
debian/tmp/usr/share/doc/filenames/examples/very_interesting_example


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to