Mercurial > gub

changeset 5398:c0fa29ff8674

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
/GUB: bin/gub, gpkg: Remove cruft and run-from-root-enable.
author Jan Nieuwenhuizen <janneke@gnu.org>
date Fri, 24 Jul 2009 13:53:58 +0200
parents 56f408767419
children 385af1bd3996
files bin/gpkg bin/gub
diffstat 2 files changed, 16 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/bin/gpkg	Fri Jul 24 13:52:55 2009 +0200
+++ b/bin/gpkg	Fri Jul 24 13:53:58 2009 +0200
@@ -29,6 +29,9 @@
     if not prefix:
         prefix = bindir + '/..'
     sys.path.insert (0, prefix)
+    if sys.path[0] == 'gbin/..':
+        sys.path[0] = '/'
+        os.getcwd = lambda: '/'
 
 argv0_relocation ()
 
--- a/bin/gub	Fri Jul 24 13:52:55 2009 +0200
+++ b/bin/gub	Fri Jul 24 13:53:58 2009 +0200
@@ -27,6 +27,9 @@
     if not prefix:
         prefix = bindir + '/..'
     sys.path.insert (0, prefix)
+    if sys.path[0] == 'gbin/..':
+        sys.path[0] = '/'
+        os.getcwd = lambda: '/'
 
 argv0_relocation ()
 
@@ -104,10 +107,12 @@
 
     p.add_option ('--offline', action='store_true',
                   dest='offline',
+                  default='False',
                   help='Do not attempt to download anything')
 
     p.add_option ('--online', action='store_false',
                   dest='offline',
+                  default='False',
                   help='Download as part of the build')
 
     def set_stage (option, opt_str, value, parser):
@@ -142,18 +147,15 @@
 
     p.add_option ('--force-package', action='store_true',
                   default=False,
-                  dest='force_package',
                   help='allow packaging of tainted compiles' )
 
     p.add_option ('--build-source', action='store_true',
                   default=False,
-                  dest='build_source',
                   help='build source packages')
 
     p.add_option ('--lax-checksums',
                   action='store_true',
                   default=False,
-                  dest='lax_checksums',
                   help="do not rebuild packages with failing checksums")
 
     p.add_option ('-n', '--dry-run',
@@ -161,25 +163,23 @@
                   default=False,
                   help='Print action, do not run.')
 
-    p.add_option ('--dependencies',
+    p.add_option ('--show-dependencies',
                   action='store_true',
                   default=False,
-                  help='Print action, do not run.')
+                  help='Print dependencies.')
 
     p.add_option ('-x', '--no-dependencies',
-                  action='store_true',
+                  action='store_false',
                   default=False,
-                  help='Print action, do not run.')
+                  help='Ignore dependencies.')
 
     p.add_option ('-l', '--skip-if-locked',
                   default=False,
-                  dest="skip_if_locked",
                   action="store_true",
                   help="Return successfully if another build is already running")
 
     p.add_option ('-j', '--jobs',
                   default="1", action='store',
-                  dest='cpu_count',
                   help='set number of simultaneous jobs')
 
     return p
@@ -212,7 +212,7 @@
                 specs[spec.platform_name ()] = spec
     platform = settings.platform
     dep_str = ' '.join (names)
-    if options.dependencies:
+    if options.show_dependencies:
         logging.stage ('dependencies[%(platform)s]: %(dep_str)s\n' % locals ())
         sys.exit (0)
     dep_str.replace (misc.with_platform ('', platform), '')
@@ -261,7 +261,7 @@
 
     b = buildrunner.BuildRunner (manager, settings, options, specs)
 
-    if options.dependencies:
+    if options.show_dependencies:
         sys.exit (0)
 
     b.calculate_checksums ()
@@ -315,9 +315,10 @@
 
 def main ():
     if not 'stat' in misc.librestrict ():
+        os.environ['LIBRESTRICT'] = 'open:stat'
         printf ('non-stat restriction is obsolete, use')
         printf ('export LIBRESTRICT=open:stat')
-        sys.exit (2)
+#        sys.exit (2)
 
     os.environ = gub.settings.clean_environment ()
     # FIXME: pydb hack.  TODO: make gub run not from srcdir