[jhbuild/wip/path-env: 16/20] config: remove check for ancient	jhbuild script
- From: Ryan Lortie <desrt src gnome org>
- To: commits-list gnome org
- Cc: 
- Subject: [jhbuild/wip/path-env: 16/20] config: remove check for ancient	jhbuild script
- Date: Thu, 13 Mar 2014 19:20:28 +0000 (UTC)
commit ad40f904b15a0035f2d85dcca8f568aa5c16db82
Author: Ryan Lortie <desrt desrt ca>
Date:   Thu Mar 13 09:33:01 2014 -0400
    config: remove check for ancient jhbuild script
 jhbuild/config.py |   24 ------------------------
 1 files changed, 0 insertions(+), 24 deletions(-)
---
diff --git a/jhbuild/config.py b/jhbuild/config.py
index 9c18b30..4fb0dd2 100644
--- a/jhbuild/config.py
+++ b/jhbuild/config.py
@@ -128,30 +128,6 @@ class Config:
         os.environ['UNMANGLED_LD_LIBRARY_PATH'] = os.environ.get('LD_LIBRARY_PATH', '')
         os.environ['UNMANGLED_PATH'] = os.environ.get('PATH', '')
 
-        try:
-            SRCDIR
-        except NameError:
-            # this happens when an old jhbuild script is called
-            if os.path.realpath(sys.argv[0]) == os.path.expanduser('~/bin/jhbuild'):
-                # if it was installed in ~/bin/, it may be because the new one
-                # is installed in ~/.local/bin/jhbuild
-                if os.path.exists(os.path.expanduser('~/.local/bin/jhbuild')):
-                    logging.warning(
-                            _('JHBuild start script has been installed in '
-                              '~/.local/bin/jhbuild, you should remove the '
-                              'old version that is still in ~/bin/ (or make '
-                              'it a symlink to ~/.local/bin/jhbuild)'))
-            if os.path.exists(os.path.join(sys.path[0], 'jhbuild')):
-                # the old start script inserted its source directory in
-                # sys.path, use it now to set new variables
-                __builtin__.__dict__['SRCDIR'] = sys.path[0]
-                __builtin__.__dict__['PKGDATADIR'] = None
-                __builtin__.__dict__['DATADIR'] = None
-            else:
-                raise FatalError(
-                    _('Obsolete JHBuild start script, make sure it is removed '
-                      'then do run \'make install\''))
-
         env_prepends.clear()
         try:
             execfile(_defaults_file, self._config)
[
Date Prev][
Date Next]   [
Thread Prev][
Thread Next]   
[
Thread Index]
[
Date Index]
[
Author Index]