jhbuild r1782 - in trunk: . jhbuild/versioncontrol

[fpeters svn gnome org]

Author: fpeters
Date: Sun Jan  6 21:04:21 2008
New Revision: 1782
URL: http://svn.gnome.org/viewvc/jhbuild?rev=1782&view=rev

Log:
* jhbuild/versioncontrol/svn.py: only check for "Conflict" at the
beginning of strings, as "Conflict" could occur in filenames; spotted
by John Carr  (closes: #507722).



Modified:
   trunk/ChangeLog
   trunk/jhbuild/versioncontrol/svn.py

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	(original)
+++ trunk/ChangeLog	Sun Jan  6 21:04:21 2008
@@ -1,5 +1,11 @@
 2008-01-06  Frederic Peters  <fpeters 0d be>
 
+	* jhbuild/versioncontrol/svn.py: only check for "Conflict" at the
+	beginning of strings, as "Conflict" could occur in filenames; spotted
+	by John Carr  (closes: #507722).
+
+2008-01-06  Frederic Peters  <fpeters 0d be>
+
 	* jhbuild/config.py, jhbuild/defaults.jhbuildrc,
 	jhbuild/frontends/terminal.py: added a progress bar in quiet mode, as
 	in mockup in bug #503925; on by default, with possibility to disable

Modified: trunk/jhbuild/versioncontrol/svn.py
==============================================================================
--- trunk/jhbuild/versioncontrol/svn.py	(original)
+++ trunk/jhbuild/versioncontrol/svn.py	Sun Jan  6 21:04:21 2008
@@ -249,7 +249,7 @@
                     stdout = subprocess.PIPE, **kws).communicate()[0]
         except OSError, e:
             raise CommandError(str(e))
-        if 'Conflict' in output:
+        if '\nConflict' in output:
             raise CommandError('Error checking for conflicts')
 
     def checkout(self, buildscript):