Hi,sorry, the patch I send was an old version, here is the (hopefully) correct one...
Mike -- DAS-NETZWERKTEAM mike gabriel, dorfstr. 27, 24245 barmissen fon: +49 (4302) 281418, fax: +49 (4302) 281419 GnuPG Key ID 0xB588399B mail: mike.gabr...@das-netzwerkteam.de, http://das-netzwerkteam.de freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.xfb
--- /usr/bin/pristine-tar.orig 2011-12-28 16:51:02.000000000 +0100
+++ /usr/bin/pristine-tar 2011-12-28 17:29:23.000000000 +0100
@@ -261,6 +261,17 @@
$subdir="/$subdir";
}
+ # Test if $subdir is the only folder in $source, if so, also
+ # use $subdir as subpath for $source...
+ opendir(DIR, "$source");
+ my @FILES = readdir(DIR);
+ debug("files: @FILES");
+
+ # scalar(@FILES) eq 3 means: `$subdir .. .'
+ if (-d "$source$subdir" && scalar(@FILES) eq 3) {
+ $source = "$source$subdir";
+ }
+
if (! $options{clobber_source}) {
doit("cp", "-a", $source, "$tempdir/workdir$subdir");
}
pgpPZ76P0qKFZ.pgp
Description: Digitale PGP-Unterschrift
