diff --git a/pisi/api.py b/pisi/api.py index dfe71f9e..20fe0668 100644 --- a/pisi/api.py +++ b/pisi/api.py @@ -177,7 +177,6 @@ def configure_pending(): pkginfo = A[x] pkgname = util.package_name(x, pkginfo.version, pkginfo.release, - pkginfo.build, False) pkg_path = util.join_path(ctx.config.lib_dir(), pkgname) diff --git a/pisi/build.py b/pisi/build.py index 5be449d6..ff15f73f 100644 --- a/pisi/build.py +++ b/pisi/build.py @@ -624,8 +624,7 @@ class Builder: name = util.package_name(package.name, self.spec.source.version, - self.spec.source.release, - self.metadata.package.build) + self.spec.source.release) pkg = Package(name, 'w') package_names.append(name) diff --git a/pisi/util.py b/pisi/util.py index a0b72946..a9598a32 100644 --- a/pisi/util.py +++ b/pisi/util.py @@ -494,10 +494,8 @@ def clean_locks(top = '.'): # Package/Repository Related Functions # ######################################## -def package_name(name, version, release, build, prependSuffix=True): +def package_name(name, version, release, prependSuffix=True): fn = name + '-' + version + '-' + release - if build: - fn += '-' + str(build) if prependSuffix: fn += ctx.const.package_suffix return fn