[Debian-l10n-commits] r2082 - in /dl10n/trunk: Changelog lib/Debian/Pkg/Tar.pm

[nekral-guest at users.alioth.debian.org]

Author: nekral-guest
Date: Sun Jan  3 15:22:52 2010
New Revision: 2082

URL: http://svn.debian.org/wsvn/?sc=1&rev=2082
Log:
	* lib/Debian/Pkg/Tar.pm: The leading directory should not be '.',
	include the next directory in that case. This fixes the handling
	of ocfs2-tools, but needs to be checked with the whole archive.

Modified:
    dl10n/trunk/Changelog
    dl10n/trunk/lib/Debian/Pkg/Tar.pm

Modified: dl10n/trunk/Changelog
URL: http://svn.debian.org/wsvn/dl10n/trunk/Changelog?rev=2082&op=diff
==============================================================================
--- dl10n/trunk/Changelog (original)
+++ dl10n/trunk/Changelog Sun Jan  3 15:22:52 2010
@@ -1,3 +1,9 @@
+2010-01-03  Nicolas François  <nicolas.francois at centraliens.net>
+
+	* lib/Debian/Pkg/Tar.pm: The leading directory should not be '.',
+	include the next directory in that case. This fixes the handling
+	of ocfs2-tools, but needs to be checked with the whole archive.
+
 2010-01-03  Nicolas François  <nicolas.francois at centraliens.net>
 
 	* dl10n-check: Forward the --debug option to the Tar package.

Modified: dl10n/trunk/lib/Debian/Pkg/Tar.pm
URL: http://svn.debian.org/wsvn/dl10n/trunk/lib/Debian/Pkg/Tar.pm?rev=2082&op=diff
==============================================================================
--- dl10n/trunk/lib/Debian/Pkg/Tar.pm (original)
+++ dl10n/trunk/lib/Debian/Pkg/Tar.pm Sun Jan  3 15:22:52 2010
@@ -417,7 +417,7 @@
         }
         $name .= '/' if $type eq 'dir' && $name !~ m#/#;
 
-        if ($name =~ s|^([^/]+)/||) {
+        if ($name =~ s|^((\.\/)?[^/]+)/||) {
                 if ($self->{wrongdir} == 0) {
                         if ($self->{dir} ne "" && $self->{dir} ne $1) {
                                 $name = $1 . '/' . $name;