* another patch from fatih asici:

- fix: do remove trailing separator :)
  - typos, and dirname works with uri string, not URI object
This commit is contained in:
Eray Özkural
2005-11-20 13:04:17 +00:00
parent 828a566ef8
commit d033ddc43d
2 changed files with 4 additions and 4 deletions
+3 -3
View File
@@ -106,7 +106,7 @@ class Builder:
if not isinstance(specuri, URI):
specuri = URI(specuri)
if authinfo:
specuri.set_auth_info(authInfo)
specuri.set_auth_info(authinfo)
self.authinfo = authinfo
@@ -117,7 +117,7 @@ class Builder:
#make local here and fuck up
self.specdir = self.fetch_files()
else:
self.specdir = dirname(self.specuri)
self.specdir = dirname(self.specuri.get_uri())
self.sourceArchive = SourceArchive(self.spec, self.pkg_work_dir())
@@ -707,7 +707,7 @@ def __buildState_buildpackages(pb, last):
__buildState_installaction(pb, last)
pb.build_packages()
def build_until(pspecfile, state, authInfo=None):
def build_until(pspecfile, state, authinfo=None):
pb = pisi.build.Builder(pspecfile, authinfo)
pb.compile_action_script()
+1 -1
View File
@@ -179,7 +179,7 @@ def makepath(comps, relative = False, sep = os.path.sep):
def parentpath(a, sep = os.path.sep):
# remove trailing '/'
a = a.lstrip(sep)
a = a.rstrip(sep)
return a[:a.rfind(sep)]
def parenturi(a):