[Zope3-checkins] SVN: zdaemon/trunk/ Added code to try to deal with apps that extend zdaemon and don't get

[Jim Fulton]

Log message for revision 71856:
  Added code to try to deal with apps that extend zdaemon and don't get
  ZConfig schema updates correctly.
  

Changed:
  U   zdaemon/trunk/CHANGES.txt
  U   zdaemon/trunk/setup.py
  U   zdaemon/trunk/src/zdaemon/zdctl.py

-=-
Modified: zdaemon/trunk/CHANGES.txt
===================================================================
--- zdaemon/trunk/CHANGES.txt	2007-01-10 11:38:54 UTC (rev 71855)
+++ zdaemon/trunk/CHANGES.txt	2007-01-10 12:22:48 UTC (rev 71856)
@@ -1,9 +1,18 @@
 zdaemon Changelog
 *****************
 
-zdaemon 2.0a2 (2007/01/08)
+zdaemon 2.0a3 (2007/01/10)
 ==========================
 
+Bugs Fixed
+----------
+
+- Added extra checks to deal with programs that extend zdaemon
+  and copy the schema and thus don't see updates to the ZConfig schema.
+
+zdaemon 2.0a2 (2007/01/10)
+==========================
+
 New Features
 ------------
 

Modified: zdaemon/trunk/setup.py
===================================================================
--- zdaemon/trunk/setup.py	2007-01-10 11:38:54 UTC (rev 71855)
+++ zdaemon/trunk/setup.py	2007-01-10 12:22:48 UTC (rev 71856)
@@ -37,7 +37,7 @@
 name = "zdaemon"
 setup(
     name=name,
-    version="2.0a2",
+    version="2.0a3",
     url="http://www.python.org/pypi/zdaemon",
     license="ZPL 2.1",
     description=

Modified: zdaemon/trunk/src/zdaemon/zdctl.py
===================================================================
--- zdaemon/trunk/src/zdaemon/zdctl.py	2007-01-10 11:38:54 UTC (rev 71855)
+++ zdaemon/trunk/src/zdaemon/zdctl.py	2007-01-10 12:22:48 UTC (rev 71856)
@@ -136,7 +136,7 @@
 
         if (options.configroot is not None
             and
-            options.configroot.environment is not None
+            getattr(options.configroot, 'environment', None) is not None
             ):
             for k, v in options.configroot.environment.mapping.items():
                 os.environ[k] = v