[SCM] Git repository for devscripts branch, master, updated. v2.11.6-21-g3dd3c84

[James McCoy]

The following commit has been merged in the master branch:
commit 3dd3c84e2ade0d311be54ad16bc530f1e1f80633
Author: James McCoy <jamessan at debian.org>
Date:   Sun May 6 12:40:40 2012 -0400

    svnpath: Always run “svn info” instead of checking for .svn.
    
    Closes: #645106
    Signed-off-by: James McCoy <jamessan at debian.org>

diff --git a/debian/changelog b/debian/changelog
index 7487866..6df5893 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ devscripts (2.11.7) UNRELEASED; urgency=low
     Haojun for the patch.  (Closes: #667581)
   * list-unreleased: Update excluded directories to include other common
     VCSes.
+  * svnpath: Always run “svn info” instead of checking for .svn. (Closes:
+    #645106)
 
   [ Benjamin Drung ]
   * Introduce a test suite for the scripts based on shunit2.
diff --git a/scripts/svnpath.pl b/scripts/svnpath.pl
index b23ea6b..644219e 100755
--- a/scripts/svnpath.pl
+++ b/scripts/svnpath.pl
@@ -65,12 +65,8 @@ if (length $path) {
 	chdir $path || die "$path: unreadable\n";
 }
 
-our $url;
-if (-d ".svn") {
-	# Get the svn url of the current directory.
-	$url = `svn info .| grep -i ^URL: | cut -d ' ' -f 2`;
-}
-else {
+our $url = `svn info . 2>/dev/null|grep -i ^URL: | cut -d ' ' -f 2`;
+if (! length $url) {
 	# Try svk instead.
 	$url = `svk info .| grep -i '^Depot Path:' | cut -d ' ' -f 3`;
 }

-- 
Git repository for devscripts