[Zope3-checkins] SVN: Zope3/trunk/bin/mkz make mkzopeinstance work for Debian packages (collector #436);

[Fred L. Drake, Jr.]

Log message for revision 37805:
  make mkzopeinstance work for Debian packages (collector #436);
  patch contributed by Philipp Weitershausen
  

Changed:
  U   Zope3/trunk/bin/mkzeoinstance
  U   Zope3/trunk/bin/mkzopeinstance

-=-
Modified: Zope3/trunk/bin/mkzeoinstance
===================================================================
--- Zope3/trunk/bin/mkzeoinstance	2005-08-09 13:38:52 UTC (rev 37804)
+++ Zope3/trunk/bin/mkzeoinstance	2005-08-09 14:56:17 UTC (rev 37805)
@@ -30,8 +30,11 @@
         sys.path.insert(0, d)
         break
 else:
-    print >>sys.stderr, "Could not locate ZODB software installation!"
-    sys.exit(1)
+    try:
+        import ZEO
+    except ImportError:
+        print >>sys.stderr, "Could not locate ZODB software installation!"
+        sys.exit(1)
 
 
 from ZEO.mkzeoinst import ZEOInstanceBuilder

Modified: Zope3/trunk/bin/mkzopeinstance
===================================================================
--- Zope3/trunk/bin/mkzopeinstance	2005-08-09 13:38:52 UTC (rev 37804)
+++ Zope3/trunk/bin/mkzopeinstance	2005-08-09 14:56:17 UTC (rev 37805)
@@ -32,8 +32,11 @@
         sys.path.insert(0, d)
         break
 else:
-    print >>sys.stderr, "Could not locate Zope software installation!"
-    sys.exit(1)
+    try:
+        import zope.app.server
+    except ImportError:
+        print >>sys.stderr, "Could not locate Zope software installation!"
+        sys.exit(1)
 
 
 from zope.app.server.mkzopeinstance import main