* 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:
+3
-3
@@ -106,7 +106,7 @@ class Builder:
|
|||||||
if not isinstance(specuri, URI):
|
if not isinstance(specuri, URI):
|
||||||
specuri = URI(specuri)
|
specuri = URI(specuri)
|
||||||
if authinfo:
|
if authinfo:
|
||||||
specuri.set_auth_info(authInfo)
|
specuri.set_auth_info(authinfo)
|
||||||
|
|
||||||
self.authinfo = authinfo
|
self.authinfo = authinfo
|
||||||
|
|
||||||
@@ -117,7 +117,7 @@ class Builder:
|
|||||||
#make local here and fuck up
|
#make local here and fuck up
|
||||||
self.specdir = self.fetch_files()
|
self.specdir = self.fetch_files()
|
||||||
else:
|
else:
|
||||||
self.specdir = dirname(self.specuri)
|
self.specdir = dirname(self.specuri.get_uri())
|
||||||
|
|
||||||
self.sourceArchive = SourceArchive(self.spec, self.pkg_work_dir())
|
self.sourceArchive = SourceArchive(self.spec, self.pkg_work_dir())
|
||||||
|
|
||||||
@@ -707,7 +707,7 @@ def __buildState_buildpackages(pb, last):
|
|||||||
__buildState_installaction(pb, last)
|
__buildState_installaction(pb, last)
|
||||||
pb.build_packages()
|
pb.build_packages()
|
||||||
|
|
||||||
def build_until(pspecfile, state, authInfo=None):
|
def build_until(pspecfile, state, authinfo=None):
|
||||||
pb = pisi.build.Builder(pspecfile, authinfo)
|
pb = pisi.build.Builder(pspecfile, authinfo)
|
||||||
pb.compile_action_script()
|
pb.compile_action_script()
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -179,7 +179,7 @@ def makepath(comps, relative = False, sep = os.path.sep):
|
|||||||
|
|
||||||
def parentpath(a, sep = os.path.sep):
|
def parentpath(a, sep = os.path.sep):
|
||||||
# remove trailing '/'
|
# remove trailing '/'
|
||||||
a = a.lstrip(sep)
|
a = a.rstrip(sep)
|
||||||
return a[:a.rfind(sep)]
|
return a[:a.rfind(sep)]
|
||||||
|
|
||||||
def parenturi(a):
|
def parenturi(a):
|
||||||
|
|||||||
Reference in New Issue
Block a user