[Zope-CVS] CVS: Packages/zpkgtools/zpkgtools - package.py:1.7 setup.py:1.11

[Fred L. Drake, Jr.]

Update of /cvs-repository/Packages/zpkgtools/zpkgtools
In directory cvs.zope.org:/tmp/cvs-serv32494

Modified Files:
	package.py setup.py 
Log Message:
- update the names of the metadata files


=== Packages/zpkgtools/zpkgtools/package.py 1.6 => 1.7 ===
--- Packages/zpkgtools/zpkgtools/package.py:1.6	Fri Apr  2 13:56:22 2004
+++ Packages/zpkgtools/zpkgtools/package.py	Mon Apr  5 11:56:53 2004
@@ -36,7 +36,7 @@
 from zpkgtools import cfgparser
 
 
-PACKAGE_CONF = "package.conf"
+PACKAGE_CONF = "INSTALL.cfg"
 
 # SCHEMA is defined at the end of the module to allow referenced
 # functions to be defined first.


=== Packages/zpkgtools/zpkgtools/setup.py 1.10 => 1.11 ===
--- Packages/zpkgtools/zpkgtools/setup.py:1.10	Mon Mar 22 11:05:39 2004
+++ Packages/zpkgtools/zpkgtools/setup.py	Mon Apr  5 11:56:53 2004
@@ -25,6 +25,9 @@
 _logger = logging.getLogger(__name__)
 
 
+PUBLICATION_CONF = "PUBLICATION.cfg"
+
+
 class SetupContext:
     """Object representing the arguments to distutils.core.setup()."""
 
@@ -85,7 +88,7 @@
                 init_py = os.path.join(path, "__init__.py")
                 if os.path.isfile(init_py):
                     # if this package is published separately, skip it:
-                    if os.path.isfile(os.path.join(path, "PUBLICATION.txt")):
+                    if os.path.isfile(os.path.join(path, PUBLICATION_CONF)):
                         continue
                     pkgname = "%s.%s" % (name, fn)
                     self.packages.append(pkgname)
@@ -141,7 +144,7 @@
         SetupContext.__init__(self, pkgname, version, setup_file)
         self.packages.append(pkgname)
         self.load_metadata(
-            os.path.join(self._working_dir, pkgname, "PUBLICATION.txt"))
+            os.path.join(self._working_dir, pkgname, PUBLICATION_CONF))
         self.add_package_dir(pkgname, pkgname)
         self.scan_package(pkgname, os.path.join(self._working_dir, pkgname),
                           pkgname)
@@ -152,4 +155,4 @@
     def __init__(self, pkgname, version, setup_file):
         SetupContext.__init__(self, pkgname, version, setup_file)
         self.load_metadata(os.path.join(self._working_dir,
-                                        "PUBLICATION.txt"))
+                                        PUBLICATION_CONF))