revert last change
This commit is contained in:
@@ -177,6 +177,7 @@ def configure_pending():
|
|||||||
pkginfo = A[x]
|
pkginfo = A[x]
|
||||||
pkgname = util.package_name(x, pkginfo.version,
|
pkgname = util.package_name(x, pkginfo.version,
|
||||||
pkginfo.release,
|
pkginfo.release,
|
||||||
|
pkginfo.build,
|
||||||
False)
|
False)
|
||||||
pkg_path = util.join_path(ctx.config.lib_dir(),
|
pkg_path = util.join_path(ctx.config.lib_dir(),
|
||||||
pkgname)
|
pkgname)
|
||||||
|
|||||||
+2
-1
@@ -624,7 +624,8 @@ class Builder:
|
|||||||
|
|
||||||
name = util.package_name(package.name,
|
name = util.package_name(package.name,
|
||||||
self.spec.source.version,
|
self.spec.source.version,
|
||||||
self.spec.source.release)
|
self.spec.source.release,
|
||||||
|
self.metadata.package.build)
|
||||||
pkg = Package(name, 'w')
|
pkg = Package(name, 'w')
|
||||||
package_names.append(name)
|
package_names.append(name)
|
||||||
|
|
||||||
|
|||||||
+3
-1
@@ -494,8 +494,10 @@ def clean_locks(top = '.'):
|
|||||||
# Package/Repository Related Functions #
|
# 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
|
fn = name + '-' + version + '-' + release
|
||||||
|
if build:
|
||||||
|
fn += '-' + str(build)
|
||||||
if prependSuffix:
|
if prependSuffix:
|
||||||
fn += ctx.const.package_suffix
|
fn += ctx.const.package_suffix
|
||||||
return fn
|
return fn
|
||||||
|
|||||||
Reference in New Issue
Block a user