[Zope-CVS] CVS: Packages/zpkgtools/bin - zpkg:1.17

[Fred L. Drake, Jr.]

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

Modified Files:
	zpkg 
Log Message:
- added Configuration.loadStream() to support loading from a stream,
  to make it easier to embed test data in the unit tests
- moved some of the test data to strings
- added configuration option to control whether support code should be
  included in the resulting package, and enough command-line support
  to suppress the configuration


=== Packages/zpkgtools/bin/zpkg 1.16 => 1.17 ===
--- Packages/zpkgtools/bin/zpkg:1.16	Tue Mar 30 16:34:29 2004
+++ Packages/zpkgtools/bin/zpkg	Tue Mar 30 18:49:54 2004
@@ -62,6 +62,8 @@
             cf.location_maps[:0] = options.location_maps
         cf.finalize()
         self.locations = cf.locations
+        if options.include_support_code is None:
+            options.include_support_code = cf.include_support_code
 
         if resource not in self.locations:
             print >>sys.stderr, "unknown resource:", resource
@@ -253,8 +255,10 @@
         default="HEAD")
     parser.add_option(
         "-S", dest="include_support_code", action="store_false",
-        help="don't include copies of the zpkgtools support code",
-        default=True)
+        help="don't include copies of the zpkgtools support code")
+    parser.add_option(
+        "-s", dest="include_support_code", action="store_true",
+        help="include copies of the zpkgtools support code (the default)")
     parser.add_option(
         "-v", dest="version",
         help="version label for the new distribution",