Collector #1754: Fixed import of 'transaction' in 'zopectl adduser'.

doc/CHANGES.txt

@@ -29,6 +29,9 @@ Zope Changes
 
     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
 

lib/python/Zope2/Startup/zopectl.py

@@ -39,8 +39,6 @@ import os
 import sys
 import signal
 
-import transaction
-
 import zdaemon
 import Zope2.Startup
 
@@ -214,9 +212,11 @@ class ZopeCmd(ZDCmd):
             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)