Hello community,
here is the log from the commit of package yast2-packager for openSUSE:Factory
checked in at 2015-06-06 09:50:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-packager (Old)
and /work/SRC/openSUSE:Factory/.yast2-packager.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-packager"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-packager/yast2-packager.changes
2015-05-10 10:53:04.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-packager.new/yast2-packager.changes
2015-06-06 09:50:11.000000000 +0200
@@ -1,0 +2,13 @@
+Thu Jun 4 14:21:22 UTC 2015 - lsle...@suse.cz
+
+- use the full URL (incl. the password) when editing a repository
+ URL (bnc#826075)
+- 3.1.70
+
+-------------------------------------------------------------------
+Tue Jun 2 21:24:46 UTC 2015 - lsle...@suse.cz
+
+- fixed building a local ISO URL (bnc#919138)
+- 3.1.69
+
+-------------------------------------------------------------------
Old:
----
yast2-packager-3.1.68.tar.bz2
New:
----
yast2-packager-3.1.70.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.f1FJtY/_old 2015-06-06 09:50:12.000000000 +0200
+++ /var/tmp/diff_new_pack.f1FJtY/_new 2015-06-06 09:50:12.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-packager
-Version: 3.1.68
+Version: 3.1.70
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-packager-3.1.68.tar.bz2 -> yast2-packager-3.1.70.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-packager-3.1.68/package/yast2-packager.changes
new/yast2-packager-3.1.70/package/yast2-packager.changes
--- old/yast2-packager-3.1.68/package/yast2-packager.changes 2015-05-07
17:46:58.000000000 +0200
+++ new/yast2-packager-3.1.70/package/yast2-packager.changes 2015-06-05
15:23:08.000000000 +0200
@@ -1,4 +1,17 @@
-------------------------------------------------------------------
+Thu Jun 4 14:21:22 UTC 2015 - lsle...@suse.cz
+
+- use the full URL (incl. the password) when editing a repository
+ URL (bnc#826075)
+- 3.1.70
+
+-------------------------------------------------------------------
+Tue Jun 2 21:24:46 UTC 2015 - lsle...@suse.cz
+
+- fixed building a local ISO URL (bnc#919138)
+- 3.1.69
+
+-------------------------------------------------------------------
Thu May 7 14:02:11 UTC 2015 - igonzalezs...@suse.com
- Packages module uses tags instead of package names (bnc#923901)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-packager-3.1.68/package/yast2-packager.spec
new/yast2-packager-3.1.70/package/yast2-packager.spec
--- old/yast2-packager-3.1.68/package/yast2-packager.spec 2015-05-07
17:46:58.000000000 +0200
+++ new/yast2-packager-3.1.70/package/yast2-packager.spec 2015-06-05
15:23:08.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-packager
-Version: 3.1.68
+Version: 3.1.70
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-packager-3.1.68/src/clients/repositories.rb
new/yast2-packager-3.1.70/src/clients/repositories.rb
--- old/yast2-packager-3.1.68/src/clients/repositories.rb 2015-04-08
12:30:31.000000000 +0200
+++ new/yast2-packager-3.1.70/src/clients/repositories.rb 2015-06-05
15:23:08.000000000 +0200
@@ -1125,7 +1125,8 @@
if input == :replace
if @repository_view
generalData = Pkg.SourceGeneralData(id)
- url2 = Ops.get_string(generalData, "url", "")
+ # use the full URL (incl. the password) when editing it
+ url2 = Pkg.SourceURL(id)
old_url = url2
plaindir = Ops.get_string(generalData, "type", "YaST") ==
@plaindir_type
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-packager-3.1.68/src/modules/SourceDialogs.rb
new/yast2-packager-3.1.70/src/modules/SourceDialogs.rb
--- old/yast2-packager-3.1.68/src/modules/SourceDialogs.rb 2015-04-08
12:30:31.000000000 +0200
+++ new/yast2-packager-3.1.70/src/modules/SourceDialogs.rb 2015-06-05
15:23:08.000000000 +0200
@@ -333,6 +333,10 @@
new_url = uri.dup
new_url.path = File.dirname(uri.path || "")
new_url.query = nil
+ # URL scheme in the "url" option must be set to "dir" (or empty)
+ # for a local ISO image (see
https://bugzilla.suse.com/show_bug.cgi?id=919138
+ # and https://en.opensuse.org/openSUSE:Libzypp_URIs#ISO_Images )
+ new_url.scheme = "dir" if uri.scheme.downcase == "iso"
params["url"] = new_url.to_s
processed = URI("")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-packager-3.1.68/test/source_dialogs_test.rb
new/yast2-packager-3.1.70/test/source_dialogs_test.rb
--- old/yast2-packager-3.1.68/test/source_dialogs_test.rb 2015-04-08
12:30:31.000000000 +0200
+++ new/yast2-packager-3.1.70/test/source_dialogs_test.rb 2015-06-05
15:23:08.000000000 +0200
@@ -58,5 +58,12 @@
expect(subject.PostprocessISOURL(converted)).to eq(url)
end
+
+ it "uses dir url scheme parameter for local ISO files" do
+ converted = "iso:///install/openSUSE-13.2-DVD-x86_64.iso"
+ url = "iso:///?iso=openSUSE-13.2-DVD-x86_64.iso&url=dir%3A%2Finstall"
+
+ expect(subject.PostprocessISOURL(converted)).to eq(url)
+ end
end
end
