[api] make "id" attribute obsolete in new product descriptions

openSUSE · Apr 9, 2014 · 794b0e1 · 794b0e1
1 parent 555b770
commit 794b0e1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/backend/BSProductXML.pm b/src/backend/BSProductXML.pm
@@ -83,7 +83,7 @@ our $group = [
 # Defines a single product, will be used in installed system to indentify it 
 our $product = [
            'product' =>
-           'id',
+           'id',            # obsolete, do not use anymore
            'schemeversion',
            [],
            'vendor',

diff --git a/src/backend/bs_productconvert b/src/backend/bs_productconvert
@@ -1322,6 +1322,10 @@ die("illegal product name: $product->{'name'}\n") if $product->{'name'} =~ /^[_\
 die("illegal product name: $product->{'name'}\n") if $product->{'name'} =~ /[\/\000-\037]/;
 die("ERROR: File name does not match to product name ($infile/$prodRef->{'products'}->{'product'}[0]->{'name'}.product)\n") if not $infile =~ /.*\/$prodRef->{'products'}->{'product'}[0]->{'name'}.product$/;
 die("no support for multi product definitions\n") if $prodRef->{'products'}->{'product'}[1];
+my $mediaStyle = getMediaStyle($prodRef);
+unless ($mediaStyle =~ /^suse-1[12].[123]$/ || $mediaStyle =~ /^suse-sle11/) {
+  die("Do not set id attribute in product anymore.\n") if $prodRef->{'products'}->{'product'}[0]->{'id'};
+}
 
 #
 # Calculate version strings