Skip to content

Commit

Permalink
- inst_suseconfig removed, replaced by warning after new kernel
Browse files Browse the repository at this point in the history
  installation
- 2.23.0
  • Loading branch information
jsuchome committed Oct 29, 2012
1 parent e125431 commit 361d10c
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 10 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.22.0
2.23.0
7 changes: 7 additions & 0 deletions package/yast2-add-on.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Oct 29 15:11:24 CET 2012 - jsuchome@suse.cz

- inst_suseconfig removed, replaced by warning after new kernel
installation
- 2.23.0

-------------------------------------------------------------------
Thu Mar 29 13:48:15 CEST 2012 - jsuchome@suse.cz

Expand Down
5 changes: 2 additions & 3 deletions src/inst_add-on_software.ycp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
* Client providing the software overview/selection to be used
* in add-on products (their control files). If not set otherwise,
* (skip_installation), it also installs the selected resolvables
* and calls SuSEconfig.
*
* Control File Example (installation.xml):
* <workflows config:type="list">
Expand Down Expand Up @@ -46,6 +45,7 @@
* See also BNC #469320
*/
{
import "Kernel";
import "PackagesUI";
import "GetInstArgs";
import "ProductControl";
Expand Down Expand Up @@ -94,9 +94,8 @@

if (WFM::CallFunction ("inst_rpmcopy", [GetInstArgs::Buttons (false, false)]) == `abort) {
dialog_ret = `abort;
} else if (WFM::CallFunction ("inst_suseconfig", [GetInstArgs::Buttons (false, false)]) == `abort) {
dialog_ret = `abort;
} else {
Kernel::InformAboutKernelChange ();
y2milestone ("Done");
}
}
Expand Down
6 changes: 4 additions & 2 deletions src/inst_language_add-on.ycp
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
* $Id$
*/
{
import "Kernel";
import "Language";
import "Wizard";
import "Label";
Expand Down Expand Up @@ -70,8 +71,9 @@

y2milestone("Installing packages");
WFM::call("inst_rpmcopy");
WFM::call("inst_suseconfig");


Kernel::InformAboutKernelChange ();

Popup::Message (
// TRANSLATORS: popup message
_("Installation of the Language Extension has been finished.")
Expand Down
7 changes: 3 additions & 4 deletions yast2-add-on.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@
Group: System/YaST
License: GPL-2.0
Requires: autoyast2-installation
# PackagesUI module, BNC #469320
# Wizard::SetDesktopTitleAndIcon
Requires: yast2 >= 2.21.22
# Kernel::InformAboutKernelChange
Requires: yast2 >= 2.23.8
Requires: yast2-installation
Requires: yast2-country

Expand All @@ -16,7 +15,7 @@ Requires: yast2-packager >= 2.18.4
Requires: yast2-storage >= 2.16.1

BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite yast2-installation yast2-packager yast2-storage
BuildRequires: yast2 >= 2.15.22
BuildRequires: yast2 >= 2.23.8

# splitted from yast2-installation
Provides: yast2-installation:/usr/share/YaST2/clients/vendor.ycp
Expand Down

0 comments on commit 361d10c

Please sign in to comment.