cosmetics

2 files changed, 21 insertions, 14 deletions

diff --git a/nbb/nbb.in b/nbb/nbb.in
index 2bf35e1..9a01858 100644
--- a/nbb/nbb.in
+++ b/nbb/nbb.in
@@ -1,25 +1,29 @@
 #!@PYTHON@
+"""\
+nbb - ndim's branch builder frontend
+"""
 
 import sys
 import os
 
-def error():
-   sys.stderr.write("nbb: Fatal: Could not load nbb_lib.\n")
-   sys.exit(3)
-
 if __name__ == '__main__':
-   try:
-      import nbb_lib
-   except ImportError, e:
-      pythondir = "@pythondir@"
-      if os.path.exists(pythondir):
+   pythondir = "@pythondir@"
+   lib_found = False
+   for cond, path in [
+      (1, sys.path),
+      (os.path.exists(pythondir), [pythondir] + sys.path),
+      ]:
+      if cond:
+         sys.path = path
          try:
-            sys.path.insert(0, pythondir)
             import nbb_lib
+            lib_found = True
+            break
          except ImportError, e:
-            error()
-      else:
-         error()
+            pass
+   if not lib_found:
+      sys.stderr.write("nbb: Fatal: Could not load nbb_lib.\n")
+      sys.exit(3)
    #sys.stdout.write("sys.path=%s\n" % repr(sys.path))
    #sys.stdout.flush()
    nbb_lib.main(sys.argv)
diff --git a/nbb/nbb_lib.in b/nbb/nbb_lib.in
index c2880ee..1ef7850 100644
--- a/nbb/nbb_lib.in
+++ b/nbb/nbb_lib.in
@@ -1,5 +1,5 @@
 """\
-nbb_lib - moo
+nbb_lib - program innards for ndim's branch builder
 
 TODO:
  * VCS config support ('git config', etc.)
@@ -332,10 +332,12 @@ class NBB(object):
 
 
 def main(argv):
+
     prog = argv[0]
     idx = prog.rfind('/')
     if idx >= 0:
         prog = prog[idx+1:]
+
     optlist, args = getopt.getopt(argv[1:], 'hV', ['help', 'version'])
     for opt, arg in optlist:
         if opt in ('-h', '--help'):
@@ -346,6 +348,7 @@ def main(argv):
             return
         else:
             raise NotImplementedError()
+
     if len(args) == 0:
         nbb = NBB()
     elif len(args) == 1: