incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From arie...@apache.org
Subject svn commit: r1341708 - /incubator/ooo/trunk/main/solenv/bin/modules/SvnRevision.pm
Date Wed, 23 May 2012 01:29:54 GMT
Author: arielch
Date: Wed May 23 01:29:53 2012
New Revision: 1341708

URL: http://svn.apache.org/viewvc?rev=1341708&view=rev
Log:
Check svn info output for Linux Subversion

In current Linux (and cygwin) Subversion, the error message when there
is no repository on the current directory is "svn: '.' is not a working
copy".

NOTE: this message can be localized, so this only a temporary solution.
The code should really check the `svn info` return code, not the output.

Modified:
    incubator/ooo/trunk/main/solenv/bin/modules/SvnRevision.pm

Modified: incubator/ooo/trunk/main/solenv/bin/modules/SvnRevision.pm
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/bin/modules/SvnRevision.pm?rev=1341708&r1=1341707&r2=1341708&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/bin/modules/SvnRevision.pm (original)
+++ incubator/ooo/trunk/main/solenv/bin/modules/SvnRevision.pm Wed May 23 01:29:53 2012
@@ -59,7 +59,7 @@ sub DetectRevisionId ($)
     open my $proc, "cd $path && svn info 2>\&1 |";
     while (<$proc>)
     {
-        if (/svn: E155007:/)
+        if (/svn: E155007:/ || /svn: '.' is not a working copy/)
         {
             # Not in an SVN repository.
             $id = DetectRevisionIdFromGit($path);



Mime
View raw message