[devscripts] 06/14: Undo one part of Gregor's changes. It is not safe to try to undirty the upstream tarball if there is something that looks like a reasonable directory.

[James McCoy]

This is an automated email from the git hooks/post-receive script.

jamessan pushed a commit to branch master
in repository devscripts.

commit ffdc599115566bd1d3b5d1e7ee3aaf8b507dbc52
Author: Andreas Tille <tille at debian.org>
Date:   Sun Aug 26 15:20:46 2012 +0200

    Undo one part of Gregor's changes.  It is not safe to try to undirty the upstream tarball if there is something that looks like a reasonable directory.
---
 scripts/uscan.pl |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/uscan.pl b/scripts/uscan.pl
index e6c625b..2562712 100755
--- a/scripts/uscan.pl
+++ b/scripts/uscan.pl
@@ -2145,7 +2145,9 @@ sub get_main_source_dir($$$$) {
 	    $fcount++;
 	    if (-d $tempdir.'/'.$file) {
 		$any_dir = $tempdir . '/' . $file;
-		$main_source_dir = $any_dir if $file =~ /^$pkg\w*$newversion$excludesuffix\.orig$/i;
+		# check whether there is some dir in upstream source which looks reasonable
+		# If such dir exists, we do not try to undirty the directory structure
+		$main_source_dir = $any_dir if $file =~ /^$pkg\w*$newversion$/i;
 	    }
 	}
     }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git