[backend] fix media to medium attribute for product pool repos

openSUSE · Jul 9, 2014 · d72928b · d72928b
1 parent 0b9e501
commit d72928b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/src/api/test/fixtures/backend/source/fixed_product/fixed.product b/src/api/test/fixtures/backend/source/fixed_product/fixed.product
@@ -11,7 +11,7 @@
       <release>3</release>
       <register>
         <pool>
-          <repository project="BaseDistro3" name="BaseDistro3_repo" media="DVD" />
+          <repository project="BaseDistro3" name="BaseDistro3_repo" medium="DVD" />
         </pool>
         <updates>
           <repository project="BaseDistro2.0:LinkedUpdateProject" name="BaseDistro2LinkedUpdateProject_repo" />

diff --git a/src/api/test/fixtures/backend/source/simple_product/simple.product b/src/api/test/fixtures/backend/source/simple_product/simple.product
@@ -11,7 +11,7 @@
       <register>
         <target>sle-11-%{_target_cpu}</target>
         <pool>
-          <repository project="BaseDistro" name="BaseDistro_repo" media="DVD" />
+          <repository project="BaseDistro" name="BaseDistro_repo" medium="DVD" />
           <repository url="http://external.url/to.some.one" />
         </pool>
         <updates>

diff --git a/src/backend/BSProductXML.pm b/src/backend/BSProductXML.pm
@@ -109,8 +109,8 @@ our $product = [
                 [[ 'repository' =>
                    'project',   # input
                    'name',
-                   'media',
-                   'url',       # this conflicts with project/name/media
+                   'medium',
+                   'url',       # this conflicts with project/name/medium
                    [ 'zypp' => 'name', 'alias' ],
                    'arch',      # for arch specific definitions
                 ]],
@@ -446,7 +446,7 @@ sub getproductrepositories {
       } else {
         my $project_expanded = $repo->{'project'};
         $project_expanded =~ s/:/:\//g;
-        $path = { 'path' => "/$project_expanded/$repo->{'name'}/repo/$repo->{'media'}" };
+        $path = { 'path' => "/$project_expanded/$repo->{'name'}/repo/$repo->{'medium'}" };
       }
       $path->{'arch'} = $repo->{'arch'} if $repo->{'arch'};
       $path->{'zypp'} = $repo->{'zypp'} if $repo->{'zypp'};

diff --git a/src/backend/bs_productconvert b/src/backend/bs_productconvert
@@ -937,11 +937,11 @@ sub writeProductSPECfile( $$$$ )
          if ($r->{'url'}) {
            die("conflicting values url<>project") if defined($r->{'project'});
            die("conflicting values url<>name")    if defined($r->{'name'});
-           die("conflicting values url<>media")   if defined($r->{'media'});
+           die("conflicting values url<>medium")   if defined($r->{'medium'});
          } else {
            die("missing project in pool repository") unless defined($r->{'project'});
            die("missing name in pool repository")    unless defined($r->{'name'});
-           die("missing media in pool repository")   unless defined($r->{'media'});
+           die("missing medium in pool repository")   unless defined($r->{'medium'});
          }
       }
       foreach my $dt ( @{$product->{register}->{updates}->{distrotarget}} ) {