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

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

Author: nekral-guest
Date: Thu Sep  9 21:57:08 2010
New Revision: 2393

URL: http://svn.debian.org/wsvn/?sc=1&rev=2393
Log:
2010-09-09  Denis Barbier  <bouzim at gmail.com>

	* lib/Debian/Pkg/Tar.pm: Fix PO extraction bug (dokuwiki)
	affected.

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=2393&op=diff
==============================================================================
--- dl10n/trunk/Changelog (original)
+++ dl10n/trunk/Changelog Thu Sep  9 21:57:08 2010
@@ -1,3 +1,8 @@
+2010-09-09  Denis Barbier  <bouzim at gmail.com>
+
+	* lib/Debian/Pkg/Tar.pm: Fix PO extraction bug (dokuwiki)
+	affected.
+
 2010-06-09  Nicolas François  <nicolas.francois at centraliens.net>
 
 	* lib/Debian/Pkg/DebSrc.pm: Avoid duplicate report for files

Modified: dl10n/trunk/lib/Debian/Pkg/Tar.pm
URL: http://svn.debian.org/wsvn/dl10n/trunk/lib/Debian/Pkg/Tar.pm?rev=2393&op=diff
==============================================================================
--- dl10n/trunk/lib/Debian/Pkg/Tar.pm (original)
+++ dl10n/trunk/lib/Debian/Pkg/Tar.pm Thu Sep  9 21:57:08 2010
@@ -272,7 +272,7 @@
 
         my ($name, $type, $size) = $self->_read_header(0) or return 0;
         my $path = '';
-        $name = $self->{dir}."/".$name if $self->{_prepend_dir};
+        $name = $self->{dir}."/".$name if $self->{_prepend_dir} && $self->{dir} ne '';
 
         $offset = $self->{offset};
         if ($type eq "file") {
@@ -422,7 +422,7 @@
         $name .= '/' if $type eq 'dir' && $name !~ m#/#;
 
         if ($name =~ s|^((\.\/)?[^/]+)/||) {
-                if ($self->{wrongdir} == 0) {
+                if ($self->{wrongdir} == 0 && $self->{_prepend_dir} == 0) {
                         if ($self->{dir} ne "" && $self->{dir} ne $1) {
                                 $name = $1 . '/' . $name;
                                 $self->{wrongdir} = 1;