jhbuild r2257 - in trunk: . jhbuild jhbuild/commands

[johncarr svn gnome org]

Author: johncarr
Date: Fri Aug 15 21:12:28 2008
New Revision: 2257
URL: http://svn.gnome.org/viewvc/jhbuild?rev=2257&view=rev

Log:
Allow changing the .jhbuildrc path by setting the JHBUILDRC environment variable.

Modified:
   trunk/ChangeLog
   trunk/jhbuild/commands/bot.py
   trunk/jhbuild/main.py

Modified: trunk/jhbuild/commands/bot.py
==============================================================================
--- trunk/jhbuild/commands/bot.py	(original)
+++ trunk/jhbuild/commands/bot.py	Fri Aug 15 21:12:28 2008
@@ -90,6 +90,7 @@
         if options.start:
             return self.start(config)
         if options.step:
+            os.environ['JHBUILDRC'] = config.filename
             os.environ['LC_ALL'] = 'C'
             os.environ['LANGUAGE'] = 'C'
             os.environ['LANG'] = 'C'

Modified: trunk/jhbuild/main.py
==============================================================================
--- trunk/jhbuild/main.py	(original)
+++ trunk/jhbuild/main.py	Fri Aug 15 21:12:28 2008
@@ -99,7 +99,7 @@
                       help=_('Information about available jhbuild commands'))
     parser.add_option('-f', '--file', action='store', metavar='CONFIG',
                       type='string', dest='configfile',
-                      default=os.path.join(os.environ['HOME'], '.jhbuildrc'),
+                      default=os.environ.get("JHBUILDRC", os.path.join(os.environ['HOME'], '.jhbuildrc')),
                       help=_('use a non default configuration file'))
     parser.add_option('-m', '--moduleset', action='store', metavar='URI',
                       type='string', dest='moduleset', default=None,