summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Koegler <mkoegler@auto.tuwien.ac.at>2012-09-27 08:01:01 +0200
committerMartin Koegler <mkoegler@auto.tuwien.ac.at>2012-09-27 08:02:27 +0200
commit4afd9f0ee03f9e51cf8db9a27fae4663e3f4dde6 (patch)
tree5fba0d133eec29cd34038d3c63c291c63c273d6b
parentd26ae038bd0ba829ad419391ea0ebd37674f65ae (diff)
downloadbuild-4afd9f0ee03f9e51cf8db9a27fae4663e3f4dde6.tar.gz
build-4afd9f0ee03f9e51cf8db9a27fae4663e3f4dde6.tar.bz2
build-4afd9f0ee03f9e51cf8db9a27fae4663e3f4dde6.zip
Bug fix: ignore links in orig tar files
-rwxr-xr-xdebtransform10
1 files changed, 8 insertions, 2 deletions
diff --git a/debtransform b/debtransform
index 0ef2692..087f5e8 100755
--- a/debtransform
+++ b/debtransform
@@ -63,8 +63,14 @@ sub listtar {
next unless /^([-dlbcp])(.........)\s+\d+\/\d+\s+(\S+) \d\d\d\d-\d\d-\d\d \d\d:\d\d(?::\d\d)? (.*)$/;
my ($type, $mode, $size, $name) = ($1, $2, $3, $4);
next if $type eq 'd';
- die("debian tar contains link: $name\n") if $type eq 'l';
- die("debian tar contains unexpected file type: $name\n") if $type ne '-';
+ if ($type eq 'l') {
+ next if $skipdebiandir eq 0;
+ die("debian tar contains link: $name\n");
+ }
+ if ($type ne '-') {
+ next if $skipdebiandir eq 0;
+ die("debian tar contains unexpected file type: $name\n");
+ }
$name =~ s/^\.\///;
$name =~ s/^debian\/// if $skipdebiandir eq 1;
push @c, {'name' => $name, 'size' => $size};