Hello community,
here is the log from the commit of package yast2-product-creator for
openSUSE:Factory checked in at 2014-05-17 21:46:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-product-creator (Old)
and /work/SRC/openSUSE:Factory/.yast2-product-creator.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-product-creator"
Changes:
--------
---
/work/SRC/openSUSE:Factory/yast2-product-creator/yast2-product-creator.changes
2014-01-10 21:23:44.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.yast2-product-creator.new/yast2-product-creator.changes
2014-05-17 21:46:13.000000000 +0200
@@ -1,0 +2,13 @@
+Fri May 16 15:21:26 CEST 2014 - [email protected]
+
+- kiwi-schema = 6.1 for Factory and SLE12
+- 3.1.5
+
+-------------------------------------------------------------------
+Fri May 9 10:20:31 CEST 2014 - [email protected]
+
+- update to support kiwi version 5.05.57 (fate#317123)
+- require kiwi and kiwi-schema=5.8 packages
+- 3.1.4
+
+-------------------------------------------------------------------
Old:
----
yast2-product-creator-3.1.3.tar.bz2
New:
----
yast2-product-creator-3.1.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-product-creator.spec ++++++
--- /var/tmp/diff_new_pack.p3jlpd/_old 2014-05-17 21:46:14.000000000 +0200
+++ /var/tmp/diff_new_pack.p3jlpd/_new 2014-05-17 21:46:14.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-product-creator
-Version: 3.1.3
+Version: 3.1.5
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -37,9 +37,12 @@
PreReq: %fillup_prereq
Requires: autoyast2-installation
+Requires: kiwi
Requires: yast2-country
Requires: yast2-security
+Requires: kiwi-schema = 6.1
+
# ag_pattern handling gzipped files
Requires: yast2-add-on-creator >= 2.17.1
++++++ yast2-product-creator-3.1.3.tar.bz2 ->
yast2-product-creator-3.1.5.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-product-creator-3.1.3/package/yast2-product-creator.changes
new/yast2-product-creator-3.1.5/package/yast2-product-creator.changes
--- old/yast2-product-creator-3.1.3/package/yast2-product-creator.changes
2014-01-09 18:48:56.000000000 +0100
+++ new/yast2-product-creator-3.1.5/package/yast2-product-creator.changes
2014-05-16 16:14:42.000000000 +0200
@@ -1,4 +1,17 @@
-------------------------------------------------------------------
+Fri May 16 15:21:26 CEST 2014 - [email protected]
+
+- kiwi-schema = 6.1 for Factory and SLE12
+- 3.1.5
+
+-------------------------------------------------------------------
+Fri May 9 10:20:31 CEST 2014 - [email protected]
+
+- update to support kiwi version 5.05.57 (fate#317123)
+- require kiwi and kiwi-schema=5.8 packages
+- 3.1.4
+
+-------------------------------------------------------------------
Thu Jan 9 10:35:32 CET 2014 - [email protected]
- update mkisofs package requirement (bnc#856658)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-product-creator-3.1.3/package/yast2-product-creator.spec
new/yast2-product-creator-3.1.5/package/yast2-product-creator.spec
--- old/yast2-product-creator-3.1.3/package/yast2-product-creator.spec
2014-01-09 18:48:56.000000000 +0100
+++ new/yast2-product-creator-3.1.5/package/yast2-product-creator.spec
2014-05-16 16:14:42.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-product-creator
-Version: 3.1.3
+Version: 3.1.5
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -30,7 +30,9 @@
PreReq: %fillup_prereq
-Requires: autoyast2-installation yast2-security yast2-country
+Requires: autoyast2-installation yast2-security yast2-country kiwi
+
+Requires: kiwi-schema = 6.1
# ag_pattern handling gzipped files
Requires: yast2-add-on-creator >= 2.17.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-product-creator-3.1.3/src/include/product-creator/kiwi_dialogs.rb
new/yast2-product-creator-3.1.5/src/include/product-creator/kiwi_dialogs.rb
--- old/yast2-product-creator-3.1.3/src/include/product-creator/kiwi_dialogs.rb
2014-01-09 20:57:31.000000000 +0100
+++ new/yast2-product-creator-3.1.5/src/include/product-creator/kiwi_dialogs.rb
2014-05-16 16:14:42.000000000 +0200
@@ -353,7 +353,7 @@
if Ops.greater_than(
Builtins.size(
- Ops.get_list(packages, [package_set, "opensusePattern"], [])
+ Ops.get_list(packages, [package_set, "namedCollection"], [])
),
0
)
@@ -361,7 +361,7 @@
pat = Summary.AddHeader("", _("Patterns"))
end
Builtins.foreach(
- Ops.get_list(packages, [package_set, "opensusePattern"], [])
+ Ops.get_list(packages, [package_set, "namedCollection"], [])
) do |patmap|
pat = Summary.AddListItem(pat, Ops.get_string(patmap, "name", ""))
end
@@ -411,7 +411,7 @@
ret_map = runPackageSelector(
"",
- Builtins.maplist(Ops.get_list(sw_contents, "opensusePattern", [])) do
|pat|
+ Builtins.maplist(Ops.get_list(sw_contents, "namedCollection", [])) do
|pat|
Ops.get_string(pat, "name", "")
end,
Builtins.maplist(Ops.get_list(sw_contents, "package", [])) do |pat|
@@ -427,7 +427,7 @@
end
Ops.set(
sw_contents,
- "opensusePattern",
+ "namedCollection",
Builtins.maplist(Ops.get_list(ret_map, "addons", [])) do |name|
{ "name" => name }
end
@@ -1130,9 +1130,9 @@
:Value,
Ops.get_string(group_map, "group", "")
)
- if Ops.get_string(user_map, "pwd", "") != ""
- UI.ChangeWidget(Id(:pw1), :Value, Ops.get_string(user_map, "pwd",
""))
- UI.ChangeWidget(Id(:pw2), :Value, Ops.get_string(user_map, "pwd",
""))
+ if Ops.get_string(user_map, "password", "") != ""
+ UI.ChangeWidget(Id(:pw1), :Value, user_map["password"])
+ UI.ChangeWidget(Id(:pw2), :Value, user_map["password"])
end
# popup label
UI.ChangeWidget(Id(:label), :Value, _("Edit User"))
@@ -1142,7 +1142,7 @@
ret = UI.UserInput
if ret == :ok
username = Convert.to_string(UI.QueryWidget(Id(:username), :Value))
- pwd = Convert.to_string(UI.QueryWidget(Id(:pw1), :Value))
+ password = Convert.to_string(UI.QueryWidget(Id(:pw1), :Value))
new_group = Convert.to_string(UI.QueryWidget(Id(:group), :Value))
gid = Convert.to_string(UI.QueryWidget(Id(:gid), :Value))
if username == ""
@@ -1151,7 +1151,7 @@
ret = :notnext
next
end
- if pwd != UI.QueryWidget(Id(:pw2), :Value)
+ if password != UI.QueryWidget(Id(:pw2), :Value)
# popup message
Report.Error(_("The passwords do not match.\nTry again."))
ret = :notnext
@@ -1159,9 +1159,9 @@
end
# ok, now update the structures
user_map = {
- "pwd" => pwd,
+ "password" => password,
"encrypted" => Ops.get_boolean(user_map, "encrypted", false) &&
- pwd == Ops.get_string(user_map, "pwd", ""),
+ password == Ops.get_string(user_map, "password", ""),
"name" => username
}
Builtins.foreach(["home", "realname", "id"]) do |key2|
@@ -1586,7 +1586,7 @@
Pkg.ResolvableNeutral("", :package, true)
Pkg.ResolvableNeutral("", :pattern, true)
- Builtins.foreach(Ops.get_list(pmap, "opensusePattern", [])) do |pat|
+ Builtins.foreach(Ops.get_list(pmap, "namedCollection", [])) do |pat|
Pkg.ResolvableInstall(Ops.get_string(pat, "name", ""), :pattern)
end
@@ -1966,7 +1966,7 @@
sw_contents = Ops.get_map(@KiwiConfig, ["packages", index], {})
Ops.set(
sw_contents,
- "opensusePattern",
+ "namedCollection",
Builtins.maplist(Ops.get_list(ProductCreator.Config, "addons", []))
do |name2|
{ "name" => name2 }
end
@@ -2073,7 +2073,7 @@
Ops.set(
ProductCreator.Config,
"addons",
- Builtins.maplist(Ops.get_list(sw_contents, "opensusePattern", []))
do |pat|
+ Builtins.maplist(Ops.get_list(sw_contents, "namedCollection", []))
do |pat|
Ops.get_string(pat, "name", "")
end
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-product-creator-3.1.3/src/modules/Kiwi.rb
new/yast2-product-creator-3.1.5/src/modules/Kiwi.rb
--- old/yast2-product-creator-3.1.3/src/modules/Kiwi.rb 2014-01-09
20:57:31.000000000 +0100
+++ new/yast2-product-creator-3.1.5/src/modules/Kiwi.rb 2014-05-16
16:14:42.000000000 +0200
@@ -406,7 +406,7 @@
Ops.set(umap, "id", Builtins.sformat("%1", Ops.get(umap, "id")))
end
# add internal info if password was already crypted
- Ops.set(umap, "encrypted", Ops.get(umap, "pwd") != nil)
+ Ops.set(umap, "encrypted", Ops.get(umap, "password") != nil)
deep_copy(umap)
end)
if Ops.get(gmap, "id") != nil
@@ -518,17 +518,8 @@
gmap,
"user",
Builtins.maplist(Ops.get_list(gmap, "user", [])) do |umap|
- encrypted = Ops.get_boolean(umap, "encrypted", false)
- Ops.set(
- umap,
- "pwd",
- Ops.get_boolean(umap, "encrypted", false) ?
- Ops.get_string(umap, "pwd", "") :
- crypt_password(Ops.get_string(umap, "pwd", ""))
- )
- if Builtins.haskey(umap, "encrypted")
- umap = Builtins.remove(umap, "encrypted")
- end
+ umap["password"] = crypt_password(umap["password"]) if
(umap["encrypted"] || false)
+ umap.delete "encrypted"
deep_copy(umap)
end
)
@@ -562,7 +553,7 @@
)
end
Builtins.foreach(Ops.get_list(_KiwiConfig, "packages", [])) do
|packagemap|
- if Builtins.size(Ops.get_list(packagemap, "opensusePattern", [])) == 0
&&
+ if Builtins.size(Ops.get_list(packagemap, "namedCollection", [])) == 0
&&
Builtins.size(Ops.get_list(packagemap, "package", [])) == 0
Builtins.y2milestone("no patterns/packages in %1", packagemap)
end
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
