[gentoo-commits] portage r11613 - main/trunk/bin

[Zac Medico (zmedico)]

Author: zmedico
Date: 2008-10-02 16:57:45 +0000 (Thu, 02 Oct 2008)
New Revision: 11613

Modified:
   main/trunk/bin/repoman
Log:
Fix `svn status` output parsing for compatibility with subversion-1.6. Thanks
to Arfrever for this patch.


Modified: main/trunk/bin/repoman
===================================================================
--- main/trunk/bin/repoman	2008-10-02 15:16:28 UTC (rev 11612)
+++ main/trunk/bin/repoman	2008-10-02 16:57:45 UTC (rev 11613)
@@ -753,8 +753,8 @@
 
 if vcs == "svn":
 	svnstatus = os.popen("svn status").readlines()
-	mychanged = [ "./" + elem.rstrip()[7:] for elem in svnstatus if elem and elem[:1] in "MR" ]
-	mynew     = [ "./" + elem.rstrip()[7:] for elem in svnstatus if elem.startswith("A") ]
+	mychanged = [ "./" + elem.split()[-1:][0] for elem in svnstatus if elem and elem[:1] in "MR" ]
+	mynew     = [ "./" + elem.split()[-1:][0] for elem in svnstatus if elem.startswith("A") ]
 
 if vcs:
 	new_ebuilds.update(x for x in mynew if x.endswith(".ebuild"))
@@ -1711,9 +1711,9 @@
 	if vcs == "svn":
 		if myautoadd:
 			svnstatus = os.popen("svn status").readlines()
-			mychanged = [ "./" + elem.rstrip()[7:] for elem in svnstatus if elem and elem[:1] in "MR" ]
-			mynew     = [ "./" + elem.rstrip()[7:] for elem in svnstatus if elem.startswith("A") ]
-		myremoved = [ "./" + elem.rstrip()[7:] for elem in svnstatus if elem.startswith("D") ]
+			mychanged = [ "./" + elem.split()[-1:][0] for elem in svnstatus if elem and elem[:1] in "MR" ]
+			mynew     = [ "./" + elem.split()[-1:][0] for elem in svnstatus if elem.startswith("A") ]
+		myremoved = [ "./" + elem.split()[-1:][0] for elem in svnstatus if elem.startswith("D") ]
 		# in contrast to CVS, SVN expands nothing by default.
 		# bin_blobs historically
 		# were just there to see what files need to be checked for