changeset 5686:af706e792a35

cygwin-packager: ld-preload workaround.
author Jan Nieuwenhuizen <janneke@gnu.org>
date Mon, 28 Sep 2009 15:51:38 +0200
parents 55c3b2b2a645
children 6d22a9872c90
files bin/cygwin-packager
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/bin/cygwin-packager	Mon Sep 28 15:32:16 2009 +0200
+++ b/bin/cygwin-packager	Mon Sep 28 15:51:38 2009 +0200
@@ -276,7 +276,7 @@
         self.system ('''
 rm -rf %(dir)s
 mkdir -p %(dir)s
-tar -C %(dir)s%(_v)s -zxf %(ball)s''', e)
+cd %(dir)s && tar -C %(dir)s%(_v)s -zxf %(ball)s''', e)
 
     def _tar (self, dir, ball, content, env={}):
         ball_dir = os.path.dirname (ball)
@@ -352,11 +352,11 @@
                   action='append',
                   help='set branch for package')
 
-    p.add_option ('-v', '--verbose', action='count', dest='verbose', default=1)
+    p.add_option ('-v', '--verbose', action='count', dest='verbosity', default=1)
     p.add_option ('-q', '--quiet', action='count', dest='quiet', default=0)
 
     (options, args) = p.parse_args ()
-    options.verbose -= options.quiet
+    options.verbosity -= options.quiet
     if len (args) != 1:
         p.print_help ()
         import sys
@@ -386,6 +386,7 @@
     c = Cygwin_package (settings, commands[0],
                         branches.get (commands[0], 'HEAD'))
     
+    logging.default_logger.threshold = options.verbosity
     c.connect_command_runner (runner.CommandRunner (logging.default_logger))
     c.create ()