View Issue Details

IDCategoryLast Update
0004935bugs2012-06-16 02:18
ReporterseabladeAssigned Topaul 
Reproducibilityalways 
Status resolvedResolutionfixed 
Product VersionSVN/2.0-ongoing 
Fixed in Version 
Summary0004935: [PATCH]: Update Scons SVN version build retreival to build svn_revision.cc correctly even if errors appear from svn command
DescriptionA quick patch as on my maching svn info returns errors that can be safely ignored but it screws up the build of svn_revision.cc. This patch fixes this and shouldn't cause any issues for anyone else as all it does is throws away the error output, which if there is any error output you will always have this problem.
TagsNo tags attached.

Activities

2012-06-15 16:17

 

svn_revision_patch.diff (739 bytes)
Index: SConstruct
===================================================================
--- SConstruct	(revision 12703)
+++ SConstruct	(working copy)
@@ -263,7 +263,7 @@
     cmd = "LANG= "
     cmd += "svn info "
     cmd += path
-    cmd += " | awk '/^Revision:/ { print $2}'"
+    cmd += " 2>/dev/null | awk '/^Revision:/ { print $2}'"
     return commands.getoutput (cmd)
 
 def create_stored_revision (target = None, source = None, env = None):
@@ -337,7 +337,7 @@
 #
 
 def versioned_builder(target,source,env):
-    w, r = os.popen2( "LANG= svn info | awk '/^Revision:/ { print $2}'")
+    w, r = os.popen2( "LANG= svn info 2>/dev/null | awk '/^Revision:/ { print $2}'")
     
     last_revision = r.readline().strip()
     w.close()

paul

2012-06-16 02:18

administrator   ~0013546

committed rev 12734, thanks!

Issue History

Date Modified Username Field Change
2012-06-15 16:17 seablade New Issue
2012-06-15 16:17 seablade File Added: svn_revision_patch.diff
2012-06-15 16:17 seablade cost => 0.00
2012-06-15 16:17 seablade Status new => assigned
2012-06-15 16:17 seablade Assigned To => paul
2012-06-16 00:39 cth103 Target Version => 2.8.13
2012-06-16 02:18 paul Note Added: 0013546
2012-06-16 02:18 paul Status assigned => resolved
2012-06-16 02:18 paul Resolution open => fixed