commit yast2-packager for openSUSE:Factory

22 May 2019

Hello community,

here is the log from the commit of package yast2-packager for openSUSE:Factory checked in at 2019-05-22 15:37:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-packager (Old)
 and      /work/SRC/openSUSE:Factory/.yast2-packager.new.5148 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-packager"

Wed May 22 15:37:54 2019 rev:375 rq:704635 version:4.2.7

Changes:
--------

--- /work/SRC/openSUSE:Factory/yast2-packager/yast2-packager.changes	2019-05-15 12:23:55.142165895 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-packager.new.5148/yast2-packager.changes	2019-05-22 15:37:56.366600484 +0200
@@ -1,0 +2,7 @@
+Tue May 21 15:19:38 CEST 2019 - schubi@suse.de
+
+- List of Online Repositories: Overwrite already existing repos in
+  "new installation" mode (bsc#1132622).
+- 4.2.7
+
+-------------------------------------------------------------------

Old:
----
  yast2-packager-4.2.6.tar.bz2

New:
----
  yast2-packager-4.2.7.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.HAB23X/_old	2019-05-22 15:37:57.482600162 +0200
+++ /var/tmp/diff_new_pack.HAB23X/_new	2019-05-22 15:37:57.490600159 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-packager
-Version:        4.2.6
+Version:        4.2.7
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

++++++ yast2-packager-4.2.6.tar.bz2 -> yast2-packager-4.2.7.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-4.2.6/package/yast2-packager.changes new/yast2-packager-4.2.7/package/yast2-packager.changes
--- old/yast2-packager-4.2.6/package/yast2-packager.changes	2019-05-14 16:57:19.000000000 +0200
+++ new/yast2-packager-4.2.7/package/yast2-packager.changes	2019-05-22 09:15:05.000000000 +0200
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Tue May 21 15:19:38 CEST 2019 - schubi@suse.de
+
+- List of Online Repositories: Overwrite already existing repos in
+  "new installation" mode (bsc#1132622).
+- 4.2.7
+
+-------------------------------------------------------------------
 Tue May 14 09:16:22 CEST 2019 - schubi@suse.de
 
 - List of Online Repositories: Do not show already added repos.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-4.2.6/package/yast2-packager.spec new/yast2-packager-4.2.7/package/yast2-packager.spec
--- old/yast2-packager-4.2.6/package/yast2-packager.spec	2019-05-14 16:57:19.000000000 +0200
+++ new/yast2-packager-4.2.7/package/yast2-packager.spec	2019-05-22 09:15:05.000000000 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-packager
-Version:        4.2.6
+Version:        4.2.7
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-4.2.6/src/lib/y2packager/clients/inst_productsources.rb new/yast2-packager-4.2.7/src/lib/y2packager/clients/inst_productsources.rb
--- old/yast2-packager-4.2.6/src/lib/y2packager/clients/inst_productsources.rb	2019-05-14 16:57:19.000000000 +0200
+++ new/yast2-packager-4.2.7/src/lib/y2packager/clients/inst_productsources.rb	2019-05-22 09:15:05.000000000 +0200
@@ -1394,15 +1394,20 @@
 
         Builtins.y2milestone("Using alias: %1", alias_name)
 
+        # With "check_alias"=false the added repo will not be checked
+        # if it already there but the old values will be overwriten.
+        # This is useful in the installation stage e.g. with the Live-CD
+        # where repos are already added in the running system.
         src_id = Pkg.RepositoryAdd(
-          "enabled"   => false,
-          "name"      => repo_name,
-          "base_urls" => [url],
-          "prod_dir"  => pth,
+          "enabled"     => false,
+          "name"        => repo_name,
+          "base_urls"   => [url],
+          "prod_dir"    => pth,
           # alias needs to be unique
           # bugzilla #309317
-          "alias"     => alias_name,
-          "type"      => repo_type
+          "alias"       => alias_name,
+          "type"        => repo_type,
+          "check_alias" => !Stage.initial
         )
       end
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-4.2.6/test/lib/clients/inst_productsources_test.rb new/yast2-packager-4.2.7/test/lib/clients/inst_productsources_test.rb
--- old/yast2-packager-4.2.6/test/lib/clients/inst_productsources_test.rb	2019-05-14 16:57:19.000000000 +0200
+++ new/yast2-packager-4.2.7/test/lib/clients/inst_productsources_test.rb	2019-05-22 09:15:05.000000000 +0200
@@ -96,7 +96,7 @@
     it "uses passed alias" do
       expect(Yast::Pkg).to receive(:RepositoryAdd)
         .with("enabled" => false, "name" => "main", "base_urls" => ["http://yast.rulezz.com"],
-          "prod_dir" => "/", "alias" => "alias1", "type" => "RPM-MD")
+          "prod_dir" => "/", "alias" => "alias1", "type" => "RPM-MD", "check_alias" => true)
         .and_return(1)
 
       client.CreateSource("http://yast.rulezz.com", "/", "main", "alias1")
@@ -105,7 +105,8 @@
     it "uses fallback alias when passed alias" do
       expect(Yast::Pkg).to receive(:RepositoryAdd)
         .with("enabled" => false, "name" => "main", "base_urls" => ["http://yast.rulezz.com"],
-          "prod_dir" => "/prod1", "alias" => "yast.rulezz.com", "type" => "RPM-MD")
+              "prod_dir" => "/prod1", "alias" => "yast.rulezz.com",
+              "type" => "RPM-MD", "check_alias" => true)
         .and_return(1)
 
       client.CreateSource("http://yast.rulezz.com", "/prod1", "main", nil)

    

root

tags

participants (1)