From 8fe81d7d09f4099a09439d4e6ac6c8b196f677a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Mon, 21 Nov 2005 12:35:18 +0000 Subject: [PATCH] revert last change --- pisi/api.py | 1 + pisi/build.py | 3 ++- pisi/util.py | 4 +++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pisi/api.py b/pisi/api.py index 20fe0668..dfe71f9e 100644 --- a/pisi/api.py +++ b/pisi/api.py @@ -177,6 +177,7 @@ 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 ff15f73f..5be449d6 100644 --- a/pisi/build.py +++ b/pisi/build.py @@ -624,7 +624,8 @@ class Builder: name = util.package_name(package.name, self.spec.source.version, - self.spec.source.release) + self.spec.source.release, + self.metadata.package.build) pkg = Package(name, 'w') package_names.append(name) diff --git a/pisi/util.py b/pisi/util.py index a9598a32..a0b72946 100644 --- a/pisi/util.py +++ b/pisi/util.py @@ -494,8 +494,10 @@ def clean_locks(top = '.'): # Package/Repository Related Functions # ######################################## -def package_name(name, version, release, prependSuffix=True): +def package_name(name, version, release, build, prependSuffix=True): fn = name + '-' + version + '-' + release + if build: + fn += '-' + str(build) if prependSuffix: fn += ctx.const.package_suffix return fn