[zpkg] SVN: zpkgtools/trunk/bin/zpkg be a little more forceful in getting the right versions of the implementation

[Fred L. Drake, Jr.]

Log message for revision 38231:
  be a little more forceful in getting the right versions of the implementation
  packages
  

Changed:
  U   zpkgtools/trunk/bin/zpkg

-=-
Modified: zpkgtools/trunk/bin/zpkg
===================================================================
--- zpkgtools/trunk/bin/zpkg	2005-09-02 00:19:50 UTC (rev 38230)
+++ zpkgtools/trunk/bin/zpkg	2005-09-02 00:21:00 UTC (rev 38231)
@@ -16,15 +16,13 @@
 import os
 import sys
 
-try:
-    import zpkgtools
-except ImportError:
-    # Not installed; running from development copy:
-    here = os.path.dirname(os.path.realpath(__file__))
-    basedir = os.path.dirname(here)
-    sys.path.append(basedir)
-    import zpkgtools
+here = os.path.dirname(os.path.realpath(__file__))
+basedir = os.path.dirname(here)
 
+initfn = os.path.join(basedir, "zpkgtools", "__init__.py")
+if os.path.isfile(initfn):
+    sys.path.insert(0, basedir)
+
 from zpkgsetup import loggingapi as logging
 
 from zpkgtools import app