Mailinglist Archive: opensuse-buildservice (120 mails)

< Previous Next >
Re: [opensuse-buildservice] [PATCH] fix migration product generation in product converter
On Friday 08 July 2011, Dirk Müller wrote:

yast2 wagon needs the package name, not the product name.
slightly modified version is commited.
ouch, thanks for fixing!

As it turns out, the bug was actually something else... New patch:

From 8f90a3eb8f87d8eec0dfaeb0a436fb0b72cecb23 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@xxxxxxx>
Date: Mon, 11 Jul 2011 10:48:41 +0200
Subject: [PATCH] Fix product provides to provide the actual product name

---
src/backend/bs_productconvert | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/backend/bs_productconvert b/src/backend/bs_productconvert
index e1a1884..f20015e 100755
--- a/src/backend/bs_productconvert
+++ b/src/backend/bs_productconvert
@@ -803,7 +803,7 @@ sub writeMigrationSPECfile( $$$$$ )
$content.="License: BSD 3-Clause\n";
$content.="Group: System/Fhs\n";
$content.="Provides: product()\n";
- $content.="Provides: product(%name) = %{version}-%{release}\n";
+ $content.="Provides: product(".$mproduct->{name}.") =
%{version}-%{release}\n";
$content.="Requires: product(".$product->{name}.") = ".$product-
{version}."\n";
$content.="AutoReqProv: on\n";
$content.="BuildRoot: %{_tmppath}/%{name}-%{version}-build\n";
@@ -1180,7 +1180,7 @@ if (defined($product->{migrationtarget})){
# enforce correct upgrade product name
for my $upgrade ( @{$product->{upgrades}->{upgrade}||[]} ) {
$upgrade->{name} = $productname;
- $upgrade->{product} = $packagename;
+ $upgrade->{product} = $productname;
}

mkdir_p( "$outdir/_product:$packagename" ) || die ("Unable to create
migration directory\n");
--
1.7.6


--
To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-buildservice+help@xxxxxxxxxxxx

< Previous Next >