comparison fetch.py @ 51:45f7a0f80e6a

correctly call os.path.join
author Jeff Hammel <jhammel@mozilla.com>
date Tue, 15 Nov 2011 15:13:01 -0800
parents bedef9761af9
children c9f2311dedea
comparison
equal deleted inserted replaced
50:7432e54750a3 51:45f7a0f80e6a
189 self.clone(tmpdir) 189 self.clone(tmpdir)
190 if self.vcs_dir: 190 if self.vcs_dir:
191 shutil.rmtree(os.path.join(tmpdir, self.vcs_dir)) 191 shutil.rmtree(os.path.join(tmpdir, self.vcs_dir))
192 path = tmpdir 192 path = tmpdir
193 if self.subpath: 193 if self.subpath:
194 path = os.path.join([tmpdir] + self.subpath) 194 path = os.path.join(*([tmpdir] + self.subpath))
195 assert os.path.exists(path), "subpath %s of %s not found" % (os.path.sep.join(self.subpath), self.url) 195 assert os.path.exists(path), "subpath %s of %s not found" % (os.path.sep.join(self.subpath), self.url)
196 if os.path.isdir(path): 196 if os.path.isdir(path):
197 if os.path.exists(dest): 197 if os.path.exists(dest):
198 assert os.path.isdir(dest), "source is a directory; destination is a file" 198 assert os.path.isdir(dest), "source is a directory; destination is a file"
199 else: 199 else: