Skip to content

Commit

Permalink
Merge pull request #2 from jsuchome/master
Browse files Browse the repository at this point in the history
remove calls to obsolete inst_suseconfig 

review OK
  • Loading branch information
lslezak committed Oct 26, 2012
2 parents d270476 + c8776b5 commit 09cc636
Show file tree
Hide file tree
Showing 6 changed files with 48 additions and 36 deletions.
31 changes: 31 additions & 0 deletions .gitignore
@@ -0,0 +1,31 @@
Makefile
Makefile.am
Makefile.in
aclocal.m4
autom4te.cache
config.cache
config.guess
config.h
config.h.in
config.log
config.status
config.sub
configure
configure.in
depcomp
install-sh
*.pot
libtool
ltconfig
ltmain.sh
missing
mkinstalldirs
stamp-h*
Makefile.am.common
*.ami
*.bz2
*.spec
.dep
tmp.*
*.log
*.ybc
2 changes: 1 addition & 1 deletion VERSION
@@ -1 +1 @@
2.22.6
2.23.0
6 changes: 6 additions & 0 deletions package/yast2-packager.changes
@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Oct 26 12:50:13 CEST 2012 - jsuchome@suse.cz

- remove calls to obsolete inst_suseconfig
- 2.23.0

-------------------------------------------------------------------
Tue Sep 4 14:13:07 CEST 2012 - tgoettlicher@suse.de

Expand Down
5 changes: 2 additions & 3 deletions src/clients/inst_custom_packages.ycp
Expand Up @@ -80,10 +80,9 @@
&& ((commit_result[0]:0 > 0)
|| anyToDelete))
{
// prepare "you must boot" popup in inst_suseconfig
// prepare "you must boot" popup
Kernel::SetInformAboutKernelChange (oldvmlinuzsize != newvmlinuzsize);

result = (symbol) WFM::CallFunction ("inst_suseconfig", [GetInstArgs::Buttons(false, false)]);
Kernel::InformAboutKernelChange ();
}
}

Expand Down
31 changes: 4 additions & 27 deletions src/clients/sw_single.ycp
Expand Up @@ -676,37 +676,14 @@ without having package %1 installed"), required_package));

SlideShow::CloseDialog();

if (Mode::normal () // run SuSEconfig only in normal system, not during installation
if (Mode::normal () // show new kernel popup only in normal system, not during installation
&& Installation::destdir == "/"
&& ((commit_result[0]:0 > 0)
|| anyToDelete))
{
// prepare "you must boot" popup in inst_suseconfig
Kernel::SetInformAboutKernelChange (oldvmlinuzsize != newvmlinuzsize);

string suseconfig_log = Directory::logdir + "/y2log.SuSEconfig";
integer suseconfig_log_size = FileUtils::GetSize(suseconfig_log);

if (suseconfig_log_size < 0)
{
suseconfig_log_size = 0;
}

result = (symbol) WFM::CallFunction ("inst_suseconfig", [GetInstArgs::Buttons(false, false)]);

// read only the new lines at the end
string command = sformat("dd bs=1 if='%1' skip=%2", String::Quote(suseconfig_log), suseconfig_log_size);
y2milestone("Reading new susconfig log: %1", command);

map out = (map)SCR::Execute(.target.bash_output, command);
if (out["exit"]:-1 == 0)
{
PackagesUI::SetPackageSummaryItem("postinstall_log", out["stdout"]:"");
}
else
{
y2error("Could not read susconfig log: %1", out);
}
// prepare "you must boot" popup
Kernel::SetInformAboutKernelChange (oldvmlinuzsize != newvmlinuzsize);
Kernel::InformAboutKernelChange ();
}

if (Mode::normal())
Expand Down
9 changes: 4 additions & 5 deletions yast2-packager.spec.in
Expand Up @@ -9,9 +9,8 @@ BuildRequires: gcc-c++ yast2-country-data yast2-xml perl-XML-Writer update-deskt
# HTTP.ycp
BuildRequires: yast2-transfer

# String::FindMountPoint()
# Wizard::SetDialogTitleAndIcon()
BuildRequires: yast2 >= 2.21.22
# Kernel::InformAboutKernelChange
BuildRequires: yast2 >= 2.23.8

# Pkg::SetZConfig()
BuildRequires: yast2-pkg-bindings >= 2.21.8
Expand All @@ -22,8 +21,8 @@ Requires: yast2-country-data >= 2.16.3
# Pkg::SetZConfig()
Requires: yast2-pkg-bindings >= 2.21.8

# String::FindMountPoint()
Requires: yast2 >= 2.21.13
# Kernel::InformAboutKernelChange
Requires: yast2 >= 2.23.8

# unzipping license file
Requires: unzip
Expand Down

0 comments on commit 09cc636

Please sign in to comment.