pull in marien/charlies work; few tweaks needed, but mostly there.

1 files changed, 6 insertions, 4 deletions

diff --git a/bin/pwrapper_installed b/bin/pwrapper_installed
index 03267477..0fa1a87f 100755
--- a/bin/pwrapper_installed
+++ b/bin/pwrapper_installed
@@ -13,8 +13,9 @@ if __name__ == '__main__':
         print >> sys.stderr, 'Cannot import pkgcore!'
         print >> sys.stderr, 'Verify it is properly installed and/or ' \
             'PYTHONPATH is set correctly.'
-        print >> sys.stderr, 'Add --debug to the commandline for a traceback.'
-        if '--debug' in sys.argv:
+        if '--debug' not in sys.argv:
+            print >> sys.stderr, 'Add --debug to the commandline for a traceback.'
+        else:
             raise
         sys.exit(1)
 
@@ -23,8 +24,9 @@ if __name__ == '__main__':
         script = modules.load_module('pkgcore.scripts.%s' % (name,))
     except modules.FailedImport:
         print >> sys.stderr, 'Cannot load script %s.' % (name,)
-        print >> sys.stderr, 'Add --debug to the commandline for a traceback.'
-        if '--debug' in sys.argv:
+        if '--debug' not in sys.argv:
+            print >> sys.stderr, 'Add --debug to the commandline for a traceback.'
+        else:
             raise
         sys.exit(1)
     else: