jhbuild r2174 - in trunk: . jhbuild/commands jhbuild/versioncontrol

[fpeters svn gnome org]

Author: fpeters
Date: Mon Jul 21 07:38:05 2008
New Revision: 2174
URL: http://svn.gnome.org/viewvc/jhbuild?rev=2174&view=rev

Log:
* jhbuild/commands/autobuild.py, jhbuild/versioncontrol/svn.py: don't
let svn interact with the user when --no-interact is passed; and force
non-interactive build for the autobuild command.  (closes: #543767)



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

Modified: trunk/jhbuild/commands/autobuild.py
==============================================================================
--- trunk/jhbuild/commands/autobuild.py	(original)
+++ trunk/jhbuild/commands/autobuild.py	Mon Jul 21 07:38:05 2008
@@ -55,6 +55,7 @@
 
         config.autobuild_report_url = None
         config.verbose = False
+        config.interact = False
 
         if options.autogen:
             config.alwaysautogen = True

Modified: trunk/jhbuild/versioncontrol/svn.py
==============================================================================
--- trunk/jhbuild/versioncontrol/svn.py	(original)
+++ trunk/jhbuild/versioncontrol/svn.py	Mon Jul 21 07:38:05 2008
@@ -199,6 +199,9 @@
         if self.checkoutdir:
             cmd.append(self.checkoutdir)
 
+        if not self.config.interact:
+            cmd.append('--non-interactive')
+
         if self.revision and self.revision.isdigit():
             cmd.extend(['-r', '%s' % self.revision])
         elif self.config.sticky_date:
@@ -217,6 +220,10 @@
             outputdir = self.srcdir
 
         opt = []
+
+        if not self.config.interact:
+            opt.append('--non-interactive')
+
         if self.revision and self.revision.isdigit():
             opt.extend(['-r', '%s' % self.revision])
         elif self.config.sticky_date: