Revert "[backend] don't pass createrepo options to modifyrepo"

now that the travis packages are uptodate
openSUSE · Feb 24, 2014 · f034aac · f034aac
1 parent 6ab1a9f
commit f034aac
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/src/api/test/functional/maintenance_test.rb b/src/api/test/functional/maintenance_test.rb
@@ -577,7 +577,7 @@ def test_mbranch_and_maintenance_per_package_request
     assert_xml_tag :tag => 'entry', :attributes => { :name =>"other.xml.gz" }
     assert_xml_tag :tag => 'entry', :attributes => { :name =>"primary.xml.gz" }
     assert_xml_tag :tag => 'entry', :attributes => { :name =>"repomd.xml" }
-    assert_xml_tag :tag => 'entry', :attributes => { :name => %r{.*-updateinfo.xml.gz} } # by modifyrepo
+    assert_xml_tag :tag => 'entry', :attributes => { :name =>"updateinfo.xml.gz" } # by modifyrepo
 
     #cleanup
     login_king

diff --git a/src/api/test/unit/code_quality_test.rb b/src/api/test/unit/code_quality_test.rb
@@ -111,7 +111,6 @@ def setup
       'Package#revoke_requests' => 51.82,
       'PersonController#internal_register' => 108.84,
       'PersonController#put_userinfo' => 56.38,
-      'Project#branch_to_repositories_from' => 54.92,
       'Project#release_targets_ng' => 57.91,
       'Project#update_download_settings' => 52.3, 
       'Project#update_from_xml' => 68.71,
@@ -140,7 +139,6 @@ def setup
       'TagController#tagcloud' => 68.37,
       'TagController#update_tags_by_object_and_user' => 67.76,
       'User#can_create_attribute_in?' => 54.4,
-      'User::register' => 71,
       'UnregisteredUser::can_register?' => 56.74, 
       'UserLdapStrategy::find_with_ldap' => 181.11,
       'UserLdapStrategy::initialize_ldap_con' => 64.05,

diff --git a/src/backend/bs_publish b/src/backend/bs_publish
@@ -384,14 +384,14 @@ sub createrepo_rpmmd {
   if ($updateinfos && @$updateinfos) {
     print "    adding updateinfo.xml to repodata\n";
     writexml("$extrep/repodata/updateinfo.xml", undef, {'update' => $updateinfos}, $BSXML::updateinfo);
-    qsystem('modifyrepo', "$extrep/repodata/updateinfo.xml", "$extrep/repodata") && die("    modifyrepo failed: $?\n");
+    qsystem('modifyrepo', "$extrep/repodata/updateinfo.xml", "$extrep/repodata", @legacyargs) && die("    modifyrepo failed: $?\n");
     unlink("$extrep/repodata/updateinfo.xml");
   }
   unlink("$extrep/repodata/$_") for grep {/appdata\.xml/} @oldrepodata;
   if ($appdatas) {
     print "    adding appdata.xml to repodata\n";
     writexml("$extrep/repodata/appdata.xml", undef, $appdatas, $BSXML::appdata);
-    qsystem('modifyrepo', "$extrep/repodata/appdata.xml", "$extrep/repodata") && die("    modifyrepo failed: $?\n");
+    qsystem('modifyrepo', "$extrep/repodata/appdata.xml", "$extrep/repodata", @legacyargs) && die("    modifyrepo failed: $?\n");
     unlink("$extrep/repodata/appdata.xml");
   }
   unlink("$extrep/repodata/$_") for grep {/(?:deltainfo|prestodelta)\.xml/} @oldrepodata;
@@ -413,12 +413,12 @@ sub createrepo_rpmmd {
     my @mergeddeltas = map {$mergeddeltas{$_}} sort keys %mergeddeltas;
     if ($options{'deltainfo'}) {
       writexml("$extrep/repodata/deltainfo.xml", undef, {'newpackage' => \@mergeddeltas}, $BSXML::deltainfo);
-      qsystem('modifyrepo', "$extrep/repodata/deltainfo.xml", "$extrep/repodata") && die("    modifyrepo failed: $?\n");
+      qsystem('modifyrepo', "$extrep/repodata/deltainfo.xml", "$extrep/repodata", @legacyargs) && die("    modifyrepo failed: $?\n");
       unlink("$extrep/repodata/deltainfo.xml");
     }
     if ($options{'prestodelta'}) {
       writexml("$extrep/repodata/prestodelta.xml", undef, {'newpackage' => \@mergeddeltas}, $BSXML::prestodelta);
-      qsystem('modifyrepo', "$extrep/repodata/prestodelta.xml", "$extrep/repodata") && die("    modifyrepo failed: $?\n");
+      qsystem('modifyrepo', "$extrep/repodata/prestodelta.xml", "$extrep/repodata", @legacyargs) && die("    modifyrepo failed: $?\n");
       unlink("$extrep/repodata/prestodelta.xml");
     }
   }
@@ -790,15 +790,15 @@ sub createpatterns_rpmmd {
     # the default in newer createrepos
     push @legacyargs, '--unique-md-filenames', '--checksum=sha256';
   }
-  qsystem('modifyrepo', "$extrep/repodata/patterns.xml", "$extrep/repodata") && print("    modifyrepo failed: $?\n");
+  qsystem('modifyrepo', "$extrep/repodata/patterns.xml", "$extrep/repodata", @legacyargs) && print("    modifyrepo failed: $?\n");
   unlink("$extrep/repodata/patterns.xml");
 
 #  for my $pattern (@{$patterns || []}) {
 #    my $pname = "patterns.$pattern->{'name'}";
 #    $pname =~ s/\.xml$//;
 #    print "    adding pattern $pattern->{'name'} to repodata\n";
 #    writestr("$extrep/repodata/$pname.xml", undef, $pattern->{'data'});
-#    qsystem('modifyrepo', "$extrep/repodata/$pname.xml", "$extrep/repodata") && print("    modifyrepo failed: $?\n");
+#    qsystem('modifyrepo', "$extrep/repodata/$pname.xml", "$extrep/repodata", @legacyargs) && print("    modifyrepo failed: $?\n");
 #    unlink("$extrep/repodata/$pname.xml");
 #  }
 
@@ -862,7 +862,7 @@ sub createpatterns_comps {
     # the default in newer createrepos
     push @legacyargs, '--unique-md-filenames', '--checksum=sha256';
   }
-  qsystem('modifyrepo', "$extrep/repodata/group.xml", "$extrep/repodata") && print("    modifyrepo failed: $?\n");
+  qsystem('modifyrepo', "$extrep/repodata/group.xml", "$extrep/repodata", @legacyargs) && print("    modifyrepo failed: $?\n");
   unlink("$extrep/repodata/group.xml");
 
   # re-sign changed repomd.xml file