[Checkins] SVN: zope.kgs/trunk/src/zope/kgs/ Oops, bug in tests revealed 2 bugs in code.

[Stephan Richter]

Log message for revision 81908:
  Oops, bug in tests revealed 2 bugs in code.
  

Changed:
  U   zope.kgs/trunk/src/zope/kgs/README.txt
  U   zope.kgs/trunk/src/zope/kgs/intro.py
  U   zope.kgs/trunk/src/zope/kgs/site.py

-=-
Modified: zope.kgs/trunk/src/zope/kgs/README.txt
===================================================================
--- zope.kgs/trunk/src/zope/kgs/README.txt	2007-11-18 02:11:35 UTC (rev 81907)
+++ zope.kgs/trunk/src/zope/kgs/README.txt	2007-11-18 03:07:27 UTC (rev 81908)
@@ -312,7 +312,7 @@
   >>> open(os.path.join(kgsDir, 'controlled-packages.cfg'), 'w').write(' ')
   >>> open(os.path.join(kgsDir, 'buildout.cfg'), 'w').write(' ')
   >>> open(os.path.join(kgsDir, 'versions.cfg'), 'w').write(' ')
-  >>> open(os.path.join(kgsDir, 'links.cfg'), 'w').write(' ')
+  >>> open(os.path.join(kgsDir, 'links.html'), 'w').write(' ')
 
   >>> open(os.path.join(kgsDir, 'controlled-packages-1.0.0.cfg'), 'w').write(' ')
   >>> open(os.path.join(kgsDir, 'buildout-1.0.0.cfg'), 'w').write(' ')
@@ -321,7 +321,7 @@
   >>> open(os.path.join(kgsDir, 'controlled-packages-1.1.0.cfg'), 'w').write(' ')
   >>> open(os.path.join(kgsDir, 'buildout-1.1.0.cfg'), 'w').write(' ')
   >>> open(os.path.join(kgsDir, 'versions-1.1.0.cfg'), 'w').write(' ')
-  >>> open(os.path.join(kgsDir, 'links-1.1.0.cfg'), 'w').write(' ')
+  >>> open(os.path.join(kgsDir, 'links-1.1.0.html'), 'w').write(' ')
 
   >>> open(os.path.join(kgsDir, 'index.html'), 'w').write(' ')
   >>> os.mkdir(os.path.join(kgsDir, 'minimal'))
@@ -344,6 +344,9 @@
             <a href="controlled-packages-1.0.0.cfg">Controlled Packages</a>
           </li>
           <li>
+            <a href="buildout-1.0.0.cfg">Buildout Configuration</a>
+          </li>
+          <li>
             <a href="versions-1.0.0.cfg">Versions</a>
           </li>
           <li>
@@ -359,9 +362,15 @@
             <a href="controlled-packages-1.1.0.cfg">Controlled Packages</a>
           </li>
           <li>
+            <a href="buildout-1.1.0.cfg">Buildout Configuration</a>
+          </li>
+          <li>
             <a href="versions-1.1.0.cfg">Versions</a>
           </li>
           <li>
+            <a href="links-1.1.0.html">Package Links</a>
+          </li>
+          <li>
             <a href="index.html">Index</a>
           </li>
           <li>
@@ -399,7 +408,7 @@
    'cf-timestamp',
    'controlled-packages-3.4.0b2.cfg', 'controlled-packages.cfg',
    'intro.html',
-   'links-3.4.0b2.cfg', 'links.cfg',
+   'links-3.4.0b2.html', 'links.html',
    'minimal',
    'versions-3.4.0b2.cfg', 'versions.cfg',
    'zope.component', 'zope.interface']

Modified: zope.kgs/trunk/src/zope/kgs/intro.py
===================================================================
--- zope.kgs/trunk/src/zope/kgs/intro.py	2007-11-18 02:11:35 UTC (rev 81907)
+++ zope.kgs/trunk/src/zope/kgs/intro.py	2007-11-18 03:07:27 UTC (rev 81908)
@@ -24,7 +24,7 @@
 
 FEATURES = [
     ('controlled-packages-%(version)s.cfg', u'Controlled Packages'),
-    ('buildout-%s.cfg',                     u'Buildout Configuration'),
+    ('buildout-%(version)s.cfg',            u'Buildout Configuration'),
     ('versions-%(version)s.cfg',            u'Versions'),
     ('links-%(version)s.html',              u'Package Links'),
     ('index.html',                          u'Index'),

Modified: zope.kgs/trunk/src/zope/kgs/site.py
===================================================================
--- zope.kgs/trunk/src/zope/kgs/site.py	2007-11-18 02:11:35 UTC (rev 81907)
+++ zope.kgs/trunk/src/zope/kgs/site.py	2007-11-18 03:07:27 UTC (rev 81908)
@@ -43,6 +43,11 @@
         if last_update > last_modified:
             return
 
+    # Save the last generation date-time.
+    # Note: We want to do this operation first, since it might take longer to
+    # generate the site than the scheduler's wait time.
+    open(timestampPath, 'w').write(str(time.time()))
+
     # Copy the KGS config file to a versioned version
     shutil.copy(
         kgsPath, os.path.join(siteDir, 'controlled-packages-%s.cfg' %ver))
@@ -58,9 +63,9 @@
     shutil.copy(versionsPath, os.path.join(siteDir, 'versions-%s.cfg' %ver))
 
     # Create a links config file and version it
-    linksPath = os.path.join(siteDir, 'links.cfg')
+    linksPath = os.path.join(siteDir, 'links.html')
     link.generateLinks(kgsPath, linksPath)
-    shutil.copy(linksPath, os.path.join(siteDir, 'links-%s.cfg' %ver))
+    shutil.copy(linksPath, os.path.join(siteDir, 'links-%s.html' %ver))
 
     # Update the full index (which is asummed to live in the site directory)
     ppix.generatePackagePages(kgsPath, siteDir)
@@ -76,10 +81,7 @@
     introPath = os.path.join(siteDir, 'intro.html')
     intro.main((introPath,))
 
-    # Save the last generation date-time.
-    open(timestampPath, 'w').write(str(time.time()))
 
-
 def main(args=None):
     if args is None:
         args = sys.argv[1:]