[Zope-CVS] CVS: Packages/zpkgtools/zpkgtools - include.py:1.15

[Fred L. Drake, Jr.]

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

Modified Files:
	include.py 
Log Message:
remove unused functionality


=== Packages/zpkgtools/zpkgtools/include.py 1.14 => 1.15 ===
--- Packages/zpkgtools/zpkgtools/include.py:1.14	Wed Mar 31 13:32:48 2004
+++ Packages/zpkgtools/zpkgtools/include.py	Wed Mar 31 15:42:22 2004
@@ -145,14 +145,6 @@
         self.source = os.path.abspath(source)
         self.destination = os.path.abspath(destination)
         self.manifests = []
-        prefix = os.path.commonprefix([self.source, self.destination])
-        if prefix == self.source:
-            raise InclusionError("destination directory may not be"
-                                 " contained in the source directory")
-        elif prefix == self.destination:
-            raise InclusionError("source directory may not be"
-                                 " contained in the destination directory")
-        self.cvsurl = None
         self.cvs_loader = None
 
     def createDistributionTree(self, spec=None):
@@ -163,7 +155,7 @@
         """
         if spec is None:
             spec = Specification(self.source)
-        self.copyTree(self.source, self.destination, spec.excludes)
+        self.copyTree(spec.source, self.destination, spec.excludes)
         for relpath, source in spec.includes.iteritems():
             self.addSingleInclude(relpath, source)
 
@@ -277,10 +269,7 @@
                                           destination)
         else:
             if isinstance(cvsurl, cvsloader.RepositoryUrl):
-                if self.cvsurl is None:
-                    raise InclusionError(
-                        "can't load repository: URL without base cvs: URL")
-                cvsurl = self.cvsurl.join(cvsurl)
+                raise InclusionError("can't load from repository: URL")
             self.includeFromCvs(cvsurl, destination)
 
     def includeFromLocalTree(self, source, destination):