[Zope-Checkins] SVN: Zope/trunk/ Collector #1754: Fixed import of 'transaction' in 'zopectl adduser'.

[Tres Seaver]

Log message for revision 29964:
  Collector #1754: Fixed import of 'transaction' in 'zopectl adduser'.
  
  

Changed:
  U   Zope/trunk/doc/CHANGES.txt
  U   Zope/trunk/lib/python/Zope2/Startup/zopectl.py

-=-
Modified: Zope/trunk/doc/CHANGES.txt
===================================================================
--- Zope/trunk/doc/CHANGES.txt	2005-04-13 20:15:43 UTC (rev 29963)
+++ Zope/trunk/doc/CHANGES.txt	2005-04-13 20:55:17 UTC (rev 29964)
@@ -29,6 +29,9 @@
 
     Bugs fixed
   
+      - Collector #1754: Fixed import of 'transaction' in
+        'zopectl adduser' (which wasy dying with a NameError).
+
       - Collector #1750: StructuredText: fixed handling of image URLs
         with query string
 

Modified: Zope/trunk/lib/python/Zope2/Startup/zopectl.py
===================================================================
--- Zope/trunk/lib/python/Zope2/Startup/zopectl.py	2005-04-13 20:15:43 UTC (rev 29963)
+++ Zope/trunk/lib/python/Zope2/Startup/zopectl.py	2005-04-13 20:55:17 UTC (rev 29964)
@@ -39,8 +39,6 @@
 import sys
 import signal
 
-import transaction
-
 import zdaemon
 import Zope2.Startup
 
@@ -214,9 +212,11 @@
             return
         cmdline = self.get_startup_cmd(
             self.options.python ,
-            'import Zope2; app=Zope2.app();'
-            'app.acl_users._doAddUser(\'%s\', \'%s\', [\'Manager\'], []);'
-            'transaction.commit()'
+            'import Zope2; '
+            'app = Zope2.app(); '
+            'app.acl_users._doAddUser(\'%s\', \'%s\', [\'Manager\'], []); '
+            'import transaction; '
+            'transaction.commit(); '
             ) % (name, password)
         os.system(cmdline)