Hello community,
here is the log from the commit of package yast2-installation for
openSUSE:Factory checked in at 2013-08-07 20:45:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-installation (Old)
and /work/SRC/openSUSE:Factory/.yast2-installation.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-installation"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-installation/yast2-installation.changes
2013-08-05 20:55:53.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.yast2-installation.new/yast2-installation.changes
2013-08-07 20:45:48.000000000 +0200
@@ -1,0 +2,19 @@
+Wed Aug 7 12:57:05 CEST 2013 - jsuch...@suse.cz
+
+- use pure ruby solution when sorting proposal items
+
+-------------------------------------------------------------------
+Tue Aug 6 11:30:53 CEST 2013 - jsuch...@suse.cz
+
+- use pure ruby solution when sorting destkop items, so major desktop
+ (with same order number) won't get resorted
+- 3.0.3
+
+-------------------------------------------------------------------
+Mon Aug 5 13:16:04 CEST 2013 - jsuch...@suse.cz
+
+- check the product profiles during system analysis and
+ copy them to installed system (backport of fate#310730)
+- 3.0.2
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-3.0.1.tar.bz2
New:
----
yast2-installation-3.0.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.prSPkL/_old 2013-08-07 20:45:49.000000000 +0200
+++ /var/tmp/diff_new_pack.prSPkL/_new 2013-08-07 20:45:49.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-installation
-Version: 3.0.1
+Version: 3.0.3
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -47,8 +47,8 @@
# AutoinstConfig::getProposalList
Requires: autoyast2-installation >= 2.17.1
-# ProductControl::DisabledACItems, ::DisabledSubProposals
-Requires: yast2 >= 2.18.23
+# ProductProfile
+Requires: yast2 >= 3.0.1
# Language::GetLanguageItems and other API
# Language::Set (handles downloading the translation extensions)
++++++ yast2-installation-3.0.1.tar.bz2 -> yast2-installation-3.0.3.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.0.1/VERSION
new/yast2-installation-3.0.3/VERSION
--- old/yast2-installation-3.0.1/VERSION 2013-08-01 11:41:50.000000000
+0200
+++ new/yast2-installation-3.0.3/VERSION 2013-08-06 13:11:48.000000000
+0200
@@ -1 +1 @@
-3.0.1
+3.0.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.0.1/configure
new/yast2-installation-3.0.3/configure
--- old/yast2-installation-3.0.1/configure 2013-08-04 22:12:05.000000000
+0200
+++ new/yast2-installation-3.0.3/configure 2013-08-07 17:25:42.000000000
+0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for yast2-installation 3.0.1.
+# Generated by GNU Autoconf 2.69 for yast2-installation 3.0.3.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -579,8 +579,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-installation'
PACKAGE_TARNAME='yast2-installation'
-PACKAGE_VERSION='3.0.1'
-PACKAGE_STRING='yast2-installation 3.0.1'
+PACKAGE_VERSION='3.0.3'
+PACKAGE_STRING='yast2-installation 3.0.3'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
PACKAGE_URL=''
@@ -1256,7 +1256,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-installation 3.0.1 to adapt to many kinds of
systems.
+\`configure' configures yast2-installation 3.0.3 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1328,7 +1328,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-installation 3.0.1:";;
+ short | recursive ) echo "Configuration of yast2-installation 3.0.3:";;
esac
cat <<\_ACEOF
@@ -1408,7 +1408,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-installation configure 3.0.1
+yast2-installation configure 3.0.3
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1425,7 +1425,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-installation $as_me 3.0.1, which was
+It was created by yast2-installation $as_me 3.0.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2364,7 +2364,7 @@
# Define the identity of the package.
PACKAGE='yast2-installation'
- VERSION='3.0.1'
+ VERSION='3.0.3'
cat >>confdefs.h <<_ACEOF
@@ -2487,7 +2487,7 @@
-VERSION="3.0.1"
+VERSION="3.0.3"
RPMNAME="yast2-installation"
MAINTAINER="Jiří Suchomel <jsuch...@suse.cz>"
@@ -3557,7 +3557,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-installation $as_me 3.0.1, which was
+This file was extended by yast2-installation $as_me 3.0.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3610,7 +3610,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-yast2-installation config.status 3.0.1
+yast2-installation config.status 3.0.3
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.0.1/configure.ac
new/yast2-installation-3.0.3/configure.ac
--- old/yast2-installation-3.0.1/configure.ac 2013-08-04 22:12:01.000000000
+0200
+++ new/yast2-installation-3.0.3/configure.ac 2013-08-07 17:25:39.000000000
+0200
@@ -1,9 +1,9 @@
dnl configure.ac for yast2-installation
dnl
-dnl -- This file is generated by y2autoconf 3.0.1 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 3.0.2 - DO NOT EDIT! --
dnl (edit configure.ac.in or configure.in.in instead)
-AC_INIT(yast2-installation, 3.0.1, http://bugs.opensuse.org/,
yast2-installation)
+AC_INIT(yast2-installation, 3.0.3, http://bugs.opensuse.org/,
yast2-installation)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="3.0.1"
+VERSION="3.0.3"
RPMNAME="yast2-installation"
MAINTAINER="Jiří Suchomel <jsuch...@suse.cz>"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.0.1/src/clients/copy_files_finish.rb
new/yast2-installation-3.0.3/src/clients/copy_files_finish.rb
--- old/yast2-installation-3.0.1/src/clients/copy_files_finish.rb
2013-07-30 13:08:31.000000000 +0200
+++ new/yast2-installation-3.0.3/src/clients/copy_files_finish.rb
2013-08-05 14:17:15.000000000 +0200
@@ -44,6 +44,7 @@
Yast.import "Directory"
Yast.import "Packages"
Yast.import "ProductControl"
+ Yast.import "ProductProfile"
Yast.import "FileUtils"
Yast.import "String"
Yast.import "WorkflowManager"
@@ -146,6 +147,32 @@
)
end
+ # copy all product profiles to the installed system (fate#310730)
+ if ProductProfile.all_profiles != []
+ @target_dir = Builtins.sformat(
+ "%1/etc/productprofiles.d",
+ Installation.destdir
+ )
+ if !FileUtils.Exists(@target_dir)
+ SCR.Execute(path(".target.mkdir"), @target_dir)
+ end
+ Builtins.foreach(ProductProfile.all_profiles) do |profile_path|
+ Builtins.y2milestone(
+ "Copying '%1' to %2/",
+ profile_path,
+ @target_dir
+ )
+ WFM.Execute(
+ path(".local.bash"),
+ Builtins.sformat(
+ "/bin/cp -a '%1' '%2/'",
+ String.Quote(profile_path),
+ String.Quote(@target_dir)
+ )
+ )
+ end
+ end
+
# List of files used as additional workflow definitions
CopyAllWorkflowFiles()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.0.1/src/clients/inst_new_desktop.rb
new/yast2-installation-3.0.3/src/clients/inst_new_desktop.rb
--- old/yast2-installation-3.0.1/src/clients/inst_new_desktop.rb
2013-07-30 13:08:31.000000000 +0200
+++ new/yast2-installation-3.0.3/src/clients/inst_new_desktop.rb
2013-08-06 13:11:48.000000000 +0200
@@ -258,16 +258,9 @@
end
def GetDesktops(desktops, show_descr)
- sort_order = Builtins.maplist(@all_desktops) do |desktop_name,
one_desktop|
- desktop_name
- end
- sort_order = Builtins.sort(sort_order) do |x, y|
- Ops.less_than(
- Ops.get_integer(@all_desktops, [x, "order"], 99),
- Ops.get_integer(@all_desktops, [y, "order"], 99)
- )
- end
+ sort_order = @all_desktops.keys
+ sort_order.sort!{|x,y| (@all_desktops[x]["order"] || 99) <=>
(@all_desktops[y]["order"] || 99) }
if desktops == "major"
sort_order = Builtins.filter(sort_order) do |desktop_name|
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.0.1/src/clients/inst_proposal.rb
new/yast2-installation-3.0.3/src/clients/inst_proposal.rb
--- old/yast2-installation-3.0.1/src/clients/inst_proposal.rb 2013-07-30
13:08:31.000000000 +0200
+++ new/yast2-installation-3.0.3/src/clients/inst_proposal.rb 2013-08-07
13:24:36.000000000 +0200
@@ -892,12 +892,7 @@
else
Builtins.y2milestone("Proposal doesn't use tabs")
# sort modules according to presentation ordering
- modules = Builtins.sort(modules) do |mod1, mod2|
- Ops.less_than(
- Ops.get_integer(mod1, 1, 50),
- Ops.get_integer(mod2, 1, 50)
- )
- end
+ modules.sort!{|mod1,mod2| (mod1[1] || 50) <=> (mod2[1] || 50) }
# setup the list
@submodules_presentation = Builtins.maplist(modules) do |mod|
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.0.1/src/clients/inst_system_analysis.rb
new/yast2-installation-3.0.3/src/clients/inst_system_analysis.rb
--- old/yast2-installation-3.0.1/src/clients/inst_system_analysis.rb
2013-07-30 13:08:31.000000000 +0200
+++ new/yast2-installation-3.0.3/src/clients/inst_system_analysis.rb
2013-08-05 14:17:15.000000000 +0200
@@ -42,6 +42,7 @@
Yast.import "Packages"
Yast.import "Popup"
Yast.import "Product"
+ Yast.import "ProductProfile"
Yast.import "ProductFeatures"
Yast.import "Progress"
Yast.import "Report"
@@ -313,6 +314,9 @@
end
Installation.probing_done = true
+ # the last step is hidden
+ return :abort if ProductProfile.CheckCompliance(nil) == false
+
Progress.Finish
Builtins.sleep(500)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
