From d033ddc43db4ba7d4d4ec5b8aebea9c1511f2623 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eray=20=C3=96zkural?= Date: Sun, 20 Nov 2005 13:04:17 +0000 Subject: [PATCH] * another patch from fatih asici: - fix: do remove trailing separator :) - typos, and dirname works with uri string, not URI object --- pisi/build.py | 6 +++--- pisi/util.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pisi/build.py b/pisi/build.py index cb68f27c..5be449d6 100644 --- a/pisi/build.py +++ b/pisi/build.py @@ -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() diff --git a/pisi/util.py b/pisi/util.py index 997e0e2e..a0b72946 100644 --- a/pisi/util.py +++ b/pisi/util.py @@ -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):