[jhbuild] base: fix can't find bootstrap moduleset



commit 7efa4aa9405ca7af3a193bccf8cb8c6f619e6100
Author: Marc-André Lureau <marcandre lureau gmail com>
Date:   Fri May 15 20:57:33 2009 +0300

    base: fix can't find bootstrap moduleset
    
    Without this change, I get the following error (when installed with
    stow under /usr/local/stow):
    
    elmarco pipo /usr/local/stow$ jhbuild buildone libtelepathy
    I: unknown keys defined in configuration file: DATADIR
    Traceback (most recent call last):
      File /usr/local/bin/jhbuild, line 28, in <module>
        jhbuild.main.main(sys.argv[1:])
      File /usr/local/stow/jhbuild/lib/python2.5/site-packages/jhbuild/main.py, line 145, in main
        rc = jhbuild.commands.run(command, config, args)
      File /usr/local/stow/jhbuild/lib/python2.5/site-packages/jhbuild/commands/__init__.py, line 78, in run
        return cmd.execute(config, args)
      File /usr/local/stow/jhbuild/lib/python2.5/site-packages/jhbuild/commands/__init__.py, line 44, in execute
        return self.run(config, options, args)
      File /usr/local/stow/jhbuild/lib/python2.5/site-packages/jhbuild/commands/base.py, line 405, in run
        check_bootstrap_updateness(config)
      File /usr/local/stow/jhbuild/lib/python2.5/site-packages/jhbuild/commands/base.py, line 200, in check_bootstrap_updateness
        bootstrap_mtime = os.stat(bootstrap_uri)[stat.ST_MTIME]
    OSError: [Errno 2] No such file or directory: '/usr/local/lib/python2.5/site-packages/jhbuild/commands/../../modulesets/bootstrap.modules'
    
    Fix http://bugzilla.gnome.org/show_bug.cgi?id=582802
---
 jhbuild/commands/base.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/jhbuild/commands/base.py b/jhbuild/commands/base.py
index 50e53c0..f144bda 100644
--- a/jhbuild/commands/base.py
+++ b/jhbuild/commands/base.py
@@ -196,7 +196,7 @@ def check_bootstrap_updateness(config):
         if p_version != module.get_revision():
             updated_modules.append(module.name)
 
-    bootstrap_uri = os.path.join(os.path.dirname(__file__), '../../modulesets/bootstrap.modules')
+    bootstrap_uri = os.path.join(config.modulesets_dir, 'bootstrap.modules')
     bootstrap_mtime = os.stat(bootstrap_uri)[stat.ST_MTIME]
 
     if max_install_date <= bootstrap_mtime:



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]