11937 2007-05-31 19:55:37 +0400 fails on some tarballs 2007-06-05 10:18:04 +0400 1 1 4 Development Sisyphus cpan2rpm unstable all Linux CLOSED FIXED P2 major --- 1 viy lav lav qa-sisyphus oldest_to_newest 50857 0 viy 2007-05-31 19:55:37 +0400 fails on some tarballs VCP-autrijus-snapshot-0.9-20050110.tar.gz, SVN-Simple... patch is proposed cpan2rpm-fix-untar-alt-viy.patch: --- bin/cpan2rpm 2007-03-01 01:35:31 +0200 +++ bin/cpan2rpm 2007-05-31 18:43:35 +0300 @@ -1172,7 +1172,11 @@ chomp($_ = qx/$cmd/); $_ = (split)[5] unless $zip; - $dst .= "/$1" if m|^(\S+)/|; + if (-d $dst.'/'.$_) { # many CPAN tarballs has directory w/o trailing / + $dst .= "/$_"; # example is VCP-autrijus-snapshot-0.9-20050110.tar.gz + } elsif (~m|^(\S+)/|) { + $dst .= "/$1"; + } $dst =~ s|/*$||; # path shouldn't end in / or tardir gets wiped $dst =~ s|\./||; # paths in tarballs shouldn't be relative return $dst; 50858 1 2003 viy 2007-05-31 19:56:28 +0400 Created attachment 2003 fix-untar-alt-viy 51093 2 viy 2007-06-05 10:17:54 +0400 thanks :) 2003 2007-05-31 19:56:28 +0400 2007-05-31 19:56:28 +0400 fix-untar-alt-viy cpan2rpm-fix-untar-alt-viy.patch text/plain 568 viy LS0tIGJpbi9jcGFuMnJwbQkyMDA3LTAzLTAxIDAxOjM1OjMxICswMjAwCisrKyBiaW4vY3BhbjJy cG0JMjAwNy0wNS0zMSAxODo0MzozNSArMDMwMApAQCAtMTE3Miw3ICsxMTcyLDExIEBACiAKICAg ICBjaG9tcCgkXyA9IHF4LyRjbWQvKTsKICAgICAkXyA9IChzcGxpdClbNV0gdW5sZXNzICR6aXA7 Ci0gICAgJGRzdCAuPSAiLyQxIiBpZiBtfF4oXFMrKS98OworICAgIGlmICgtZCAkZHN0LicvJy4k XykgeyAjIG1hbnkgQ1BBTiB0YXJiYWxscyBoYXMgZGlyZWN0b3J5IHcvbyB0cmFpbGluZyAvCisJ JGRzdCAuPSAiLyRfIjsgICAgIyBleGFtcGxlIGlzIFZDUC1hdXRyaWp1cy1zbmFwc2hvdC0wLjkt MjAwNTAxMTAudGFyLmd6CisgICAgfSBlbHNpZiAofm18XihcUyspL3wpIHsKKwkkZHN0IC49ICIv JDEiOworICAgIH0KICAgICAkZHN0ID1+IHN8LyokfHw7ICAgICMgcGF0aCBzaG91bGRuJ3QgZW5k IGluIC8gb3IgdGFyZGlyIGdldHMgd2lwZWQKICAgICAkZHN0ID1+IHN8XC4vfHw7ICAgICMgcGF0 aHMgaW4gdGFyYmFsbHMgc2hvdWxkbid0IGJlIHJlbGF0aXZlCiAgICAgcmV0dXJuICRkc3Q7Cg==