Hello community,
here is the log from the commit of package yast2-installation
checked in at Mon Oct 13 17:03:05 CEST 2008.
--------
--- yast2-installation/yast2-installation.changes 2008-10-08 12:58:43.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-installation/yast2-installation.changes 2008-10-13 13:25:58.000000000 +0200
@@ -1,0 +2,29 @@
+Mon Oct 13 13:10:58 CEST 2008 - mzugec@suse.de
+
+- configure supportconfig in installation (fate#305180)
+- 2.17.20
+
+-------------------------------------------------------------------
+Mon Oct 13 09:45:23 CEST 2008 - locilka@suse.cz
+
+- Fixed install/update confirmation dialog (bnc #433249).
+- Fixed text in openSUSE control file (bnc #432911).
+- Fixed typo (bnc #433794).
+
+-------------------------------------------------------------------
+Fri Oct 10 14:49:58 CEST 2008 - locilka@suse.cz
+
+- Enhanced scr_switch_debugger (bnc #433057).
+- Enabling key-repeating if not running in XEN (bnc #433338).
+
+-------------------------------------------------------------------
+Thu Oct 9 21:00:01 CEST 2008 - locilka@suse.cz
+
+- Loading the Target while initializing libzypp in
+ inst_upgrade_urls (bnc #429080).
+- Running a simple SCR Test after chrooting to the installed system
+ in scr_switch_finish, full-test is called in case of simple test
+ failure (bnc #433057).
+- Added more checking around 'searching for files' (bnc #427879).
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-installation-2.17.19.tar.bz2
New:
----
yast2-installation-2.17.20.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.kd3549/_old 2008-10-13 17:02:42.000000000 +0200
+++ /var/tmp/diff_new_pack.kd3549/_new 2008-10-13 17:02:42.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.17.19)
+# spec file for package yast2-installation (Version 2.17.20)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-installation
-Version: 2.17.19
+Version: 2.17.20
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.17.19.tar.bz2
+Source0: yast2-installation-2.17.20.tar.bz2
Prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-devtools yast2-testsuite
# PackageCallbacks::RegisterEmptyProgressCallbacks()
@@ -114,7 +114,7 @@
Lukas Ocilka
%prep
-%setup -n yast2-installation-2.17.19
+%setup -n yast2-installation-2.17.20
%build
%{prefix}/bin/y2tool y2autoconf
@@ -183,6 +183,23 @@
%exclude %{prefix}/share/doc/packages/yast2-installation/COPYING
%exclude %{prefix}/share/doc/packages/yast2-installation/README
%changelog
+* Mon Oct 13 2008 mzugec@suse.de
+- configure supportconfig in installation (fate#305180)
+- 2.17.20
+* Mon Oct 13 2008 locilka@suse.cz
+- Fixed install/update confirmation dialog (bnc #433249).
+- Fixed text in openSUSE control file (bnc #432911).
+- Fixed typo (bnc #433794).
+* Fri Oct 10 2008 locilka@suse.cz
+- Enhanced scr_switch_debugger (bnc #433057).
+- Enabling key-repeating if not running in XEN (bnc #433338).
+* Thu Oct 09 2008 locilka@suse.cz
+- Loading the Target while initializing libzypp in
+ inst_upgrade_urls (bnc #429080).
+- Running a simple SCR Test after chrooting to the installed system
+ in scr_switch_finish, full-test is called in case of simple test
+ failure (bnc #433057).
+- Added more checking around 'searching for files' (bnc #427879).
* Wed Oct 08 2008 aschnell@suse.de
- removed cp of proc/mounts to /etc/mtab (bnc #425464)
- 2.17.19
++++++ yast2-installation-2.17.19.tar.bz2 -> yast2-installation-2.17.20.tar.bz2 ++++++
++++ 6854 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.17.19/src/clients/inst_pre_install.ycp new/yast2-installation-2.17.20/src/clients/inst_pre_install.ycp
--- old/yast2-installation-2.17.19/src/clients/inst_pre_install.ycp 2008-09-22 16:12:44.000000000 +0200
+++ new/yast2-installation-2.17.20/src/clients/inst_pre_install.ycp 2008-10-09 20:07:48.000000000 +0200
@@ -6,6 +6,7 @@
import "ProductFeatures";
import "ProductControl";
import "InstData";
+ import "String";
// --> Functions
@@ -178,6 +179,14 @@
files_found_on_partitions[partition_device] = one_partition_files_found;
}
+ // bnc #427879
+ map exec = (map) SCR::Execute (.target.bash_output,
+ sformat ("fuser -v '%1' 2>&1", String::Quote (mnt_tmpdir))
+ );
+ if (exec["stdout"]:"" != "") {
+ y2error ("Processes in %1: %2", mnt_tmpdir, exec);
+ }
+
// umounting
y2milestone("Umounting %1", partition_device);
if (! (boolean) SCR::Execute(.target.umount, mnt_tmpdir)) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.17.19/src/clients/inst_upgrade_urls.ycp new/yast2-installation-2.17.20/src/clients/inst_upgrade_urls.ycp
--- old/yast2-installation-2.17.19/src/clients/inst_upgrade_urls.ycp 2008-09-26 15:41:45.000000000 +0200
+++ new/yast2-installation-2.17.20/src/clients/inst_upgrade_urls.ycp 2008-10-09 20:07:48.000000000 +0200
@@ -874,7 +874,7 @@
_("Initializing package manager..."),
],
// TRANSLATORS: dialog help
- _("<p>Reading repositories. Please wait..</p>")
+ _("<p>Reading repositories. Please wait...</p>")
);
Wizard::SetTitleIcon ("yast-sw_source");
}
@@ -904,6 +904,8 @@
continue_processing = true;
// initialize zypp
Pkg::TargetInitialize (Installation::destdir);
+ // bnc #429080
+ Pkg::TargetLoad();
Pkg::SourceStartManager (false);
foreach (integer one_id, Pkg::SourceGetCurrent (true), {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.17.19/src/clients/save_config_finish.ycp new/yast2-installation-2.17.20/src/clients/save_config_finish.ycp
--- old/yast2-installation-2.17.19/src/clients/save_config_finish.ycp 2008-05-30 13:17:29.000000000 +0200
+++ new/yast2-installation-2.17.20/src/clients/save_config_finish.ycp 2008-10-13 13:12:09.000000000 +0200
@@ -8,7 +8,7 @@
* Authors:
* Jiri Srain
*
- * $Id: save_config_finish.ycp 43154 2007-12-18 12:14:54Z locilka $
+ * $Id: save_config_finish.ycp 52118 2008-10-13 11:12:08Z mzugec $
*
*/
@@ -30,6 +30,9 @@
import "Stage";
import "AddOnProduct";
import "FileUtils";
+import "Installation";
+import "String";
+
any ret = nil;
string func = "";
@@ -137,6 +140,20 @@
SignatureCheckDialogs::CheckSignatures ());
SCR::Write (.sysconfig.security, nil);
+ // save supportconfig
+ if(SCR::Read(.target.size,"/etc/install.inf") > 0) {
+ string url = (string)SCR::Read(.etc.install_inf.supporturl);
+ y2milestone("URL value from /etc/install.inf : %1", url);
+ if( url!=nil && size(url)>0){
+ string config_path=sformat("%1%2", String::Quote(Installation::destdir), "/etc/supportconfig.conf");
+ y2milestone("URL from install.inf readed, test if %1 exists", config_path);
+ if (FileUtils::Exists(config_path)){
+ y2milestone("Insert value into supportconfig.conf: %1",
+ SCR::Execute(.target.bash_output, sformat("echo 'VAR_OPTION_UPLOAD_TARGET=%1'>> %2", url, config_path)));
+ }
+ }
+ } else y2warning("/etc/install.inf not found");
+
}
else
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.17.19/src/clients/switch_scr_finish.ycp new/yast2-installation-2.17.20/src/clients/switch_scr_finish.ycp
--- old/yast2-installation-2.17.19/src/clients/switch_scr_finish.ycp 2008-08-05 12:30:01.000000000 +0200
+++ new/yast2-installation-2.17.20/src/clients/switch_scr_finish.ycp 2008-10-09 20:07:48.000000000 +0200
@@ -8,7 +8,7 @@
* Authors:
* Jiri Srain
*
- * $Id: switch_scr_finish.ycp 49690 2008-08-05 10:30:00Z locilka $
+ * $Id: switch_scr_finish.ycp 52083 2008-10-13 07:36:58Z locilka $
*
*/
@@ -36,6 +36,58 @@
RunSCRSwitchDebugger(chroot_dir);
}
+/**
+ * Check the new SCR, bnc #433057
+ *
+ * @return boolean whether successful
+ */
+boolean TestTheNewSCR () {
+ y2milestone ("Running some tests on the new SCR");
+
+ map ret_exec = (map) SCR::Execute (.target.bash_output, "TEST=OK; echo ${TEST}");
+
+ if (ret_exec["exit"]:-1 != 0) {
+ y2milestone ("SCR::Execute: %1", ret_exec);
+ y2error ("SCR Error");
+ return false;
+ }
+
+ list ret_dir = (list) SCR::Read(.target.dir, "/");
+
+ if (ret_dir == nil || ret_dir == []) {
+ y2milestone ("SCR::Read/dir: %1", ret_dir);
+ y2error ("SCR Error");
+ return false;
+ }
+
+ list scr_dir = (list) SCR::Dir(.sysconfig);
+
+ if (scr_dir == nil || scr_dir == []) {
+ y2milestone ("SCR::Dir: %1", scr_dir);
+ y2error ("SCR Error");
+ return false;
+ }
+
+ y2milestone ("SCR seems to be OK");
+ return true;
+}
+
+boolean TestTheNewSCRHandler () {
+ integer SCR_PID = FindSCRPID();
+
+// bnc #434253
+// this kills SCR
+// if (SCR_PID > 0) SwitchY2Debug (SCR_PID);
+
+ boolean ret = TestTheNewSCR();
+
+// bnc #434253
+// this kills SCR
+// if (SCR_PID > 0) SwitchY2Debug (SCR_PID);
+
+ return ret;
+}
+
/* Check arguments */
if(size(WFM::Args()) > 0 && is(WFM::Args(0), string)) {
func = (string)WFM::Args(0);
@@ -78,6 +130,7 @@
// bugzilla #201058
// WFM::SCROpen returns negative integer in case of failure
if (Installation::scr_handle == nil || Installation::scr_handle < 0) {
+ y2error ("Cannot switch to the system");
ErrorDuringSCRSwitch (Installation::destdir);
return false;
}
@@ -87,6 +140,14 @@
// re-init tmpdir from new SCR !
Directory::ResetTmpDir();
+
+ // bnc #433057
+ // Even if SCR switch worked, run a set of some simple tests
+ if (TestTheNewSCRHandler() != true) {
+ y2error ("Cannot switch to the system");
+ ErrorDuringSCRSwitch (Installation::destdir);
+ return false;
+ }
}
else
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.17.19/src/include/misc.ycp new/yast2-installation-2.17.20/src/include/misc.ycp
--- old/yast2-installation-2.17.19/src/include/misc.ycp 2008-10-03 16:33:31.000000000 +0200
+++ new/yast2-installation-2.17.20/src/include/misc.ycp 2008-10-09 20:07:48.000000000 +0200
@@ -11,7 +11,7 @@
* Authors:
* Jiri Srain
*
- * $Id: misc.ycp 51835 2008-10-03 14:33:31Z locilka $
+ * $Id: misc.ycp 52084 2008-10-13 07:47:31Z locilka $
*
*/
@@ -29,6 +29,7 @@
import "FileUtils";
import "Linuxrc";
import "InstData";
+import "HTML";
/**
* Function appends blacklisted modules to the /etc/modprobe.d/blacklist
@@ -126,7 +127,7 @@
boolean confirmInstallation()
{
// Heading for confirmation popup before the installation really starts
- string heading = "<h3>" + _("Confirm Installation") + "</h3>";
+ string heading = HTML::Heading (_("Confirm Installation"));
string body =
// Text for confirmation popup before the installation really starts 1/3
@@ -194,8 +195,8 @@
`HSpacing( 0.7 )
),
`ButtonBox (
- `PushButton (`id (`back), `opt(`default, `okButton, `key_F10), Label::BackButton()),
- `PushButton (`id (`confirm), `opt (`cancelButton, `key_F9), confirm_button_label)
+ `PushButton (`id (`cancel), `opt(`cancelButton, `key_F10, `default), Label::BackButton()),
+ `PushButton (`id (`ok), `opt (`okButton, `key_F9), confirm_button_label)
)
)
);
@@ -203,7 +204,7 @@
symbol button = (symbol) UI::UserInput();
UI::CloseDialog();
- return ( button == `confirm );
+ return (button == `ok);
}
list <string> modules_to_enable_with_AC_on = nil;
@@ -268,13 +269,20 @@
UpdateWizardSteps();
}
- // bnc #376945
- // problems with keyboard in xen
void SetXENExceptions () {
// not in text-mode
- if (! UI::TextMode() && SCR::Read (.probe.xen) == true) {
- y2milestone ("XEN in X detected: running xset");
- WFM::Execute (.local.bash, "xset r off; xset m 1");
+ if (! UI::TextMode()) {
+ // bnc #376945
+ // problems with keyboard in xen
+ if (SCR::Read (.probe.xen) == true) {
+ y2milestone ("XEN in X detected: running xset");
+ WFM::Execute (.local.bash, "xset r off; xset m 1");
+ // bnc #433338
+ // enabling key-repeating
+ } else {
+ y2milestone ("Enabling key-repeating");
+ WFM::Execute (.local.bash, "xset r on");
+ }
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.17.19/src/include/scr_switch_debugger.ycp new/yast2-installation-2.17.20/src/include/scr_switch_debugger.ycp
--- old/yast2-installation-2.17.19/src/include/scr_switch_debugger.ycp 2008-08-14 18:15:03.000000000 +0200
+++ new/yast2-installation-2.17.20/src/include/scr_switch_debugger.ycp 2008-10-09 20:07:48.000000000 +0200
@@ -26,11 +26,13 @@
import "Popup";
import "Label";
import "Icon";
+ import "Installation";
+ import "HTML";
// test result (Checking for xyz... Passed)
string result_ok = _("Passed");
// test result (Checking for xyz... Failed)
- string result_failed = _("Failed");
+ string result_failed = ("Failed");
/* ********************************************************************* */
@@ -74,6 +76,9 @@
// where logs are stored
string yast_logs = "/var/log/YaST2/";
+
+ // YaST log file
+ string yast_logfile = "y2log";
// <-- Configuration
@@ -91,7 +96,30 @@
)),
`VSpacing (0.5),
// informative text
- `Left (`Label (_("Running the debugger..."))),
+ `MarginBox (
+ 1, 1, `VBox (
+ `Left (`Label (sformat (
+ // TRANSLATORS: an error message
+ // %1 - logfile, possibly with errors
+ // %2 - link to our bugzilla
+ // %3 - directory where YaST logs are stored
+ // %4 - link to the Yast Bug Reporting HOWTO Web page
+ _("Switching to the installes system has failed
+More information can be found near the end of the '%1' file.
+
+This is worth reporting a bug at %2.
+Please, attach also all YaST logs stored in the '%3' directory.
+See %4 for more information about YaST logs."),
+ "/var/log/YaST2/y2log",
+ "http://bugzilla.novell.com/",
+ "/var/log/YaST2/",
+ // link to the Yast Bug Reporting HOWT
+ // for translators: use the localized page for your language if it exists,
+ // check the combo box "In other laguages" on top of the page
+ _("http://en.opensuse.org/Bugs/YaST")
+ )))
+ )
+ ),
`MarginBox (
1, 1, `VBox (
`MinWidth (70,
@@ -150,6 +178,12 @@
UI::ChangeWidget (`id(`log_view), `LastLine, "\n" + progress_s + "\n");
}
+ // report just a line, no modifications
+ void ReportLine (string line) {
+ y2milestone("%1", line);
+ UI::ChangeWidget (`id(`log_view), `LastLine, line + "\n");
+ }
+
// <-- Helper Functions
/* ********************************************************************* */
@@ -281,8 +315,8 @@
);
map test = (map ) SCR::Execute (.target.bash_output, one_rpm_installed);
- test_result = ((integer) test["exit"]:42 == 0);
- if (! test_result) ret = false;
+ test_result = (test["exit"]:-1 == 0);
+ if (test_result != true) ret = false;
ReportTest (
// Test progress
@@ -319,9 +353,17 @@
if (test_result) {
string required_packages_s = required_packages["stdout"]:"";
+ list <string> already_checked = [];
+
// check all required objects (sorted and only once)
foreach (string one_require, toset (splitstring (required_packages_s, "\n")), {
- if (one_require == "") continue;
+ if (one_require == nil || one_require == "") continue;
+
+ // already checked
+ if (contains (already_checked, one_require)) continue;
+ // do not check again
+ already_checked = add (already_checked, one_require);
+
if (regexpmatch (one_require, "[ \t]")) {
one_require = regexpsub (one_require, "^([^ \t]*)[ \t]", "\\1");
}
@@ -375,20 +417,88 @@
// is the package installed?
if (! RunSCRSwitchTest_CheckWhetherInstalled (package_name)) {
ret = false;
+ break;
}
// if it is installed, check whetheris has all dependencies
else if (! RunSCRSwitchTest_DoNeededRPMsRequire (package_name)) {
ret = false;
+ break;
}
});
return ret;
}
+ list <string> YaST_log_lines = [];
+
+ void PrintLinesFromTo (integer from_line, integer to_line) {
+ // start with the first line or further
+ if (from_line < 0) from_line = 0;
+
+ // print all lines
+ y2milestone ("Logging from: %1 to: %2", from_line, to_line);
+
+ while (from_line <= to_line) {
+ ReportLine (YaST_log_lines[from_line]:"");
+ from_line = from_line + 1;
+ }
+ }
+
+ // checks the YaST log on the installed system
+ boolean RunSCRSwitchTest_SCRChrootYaSTLog () {
+ boolean ret = true;
+
+ string logfile = sformat ("%1/%2/%3", Installation::destdir, yast_logs, yast_logfile);
+ y2milestone ("Checking file %1", logfile);
+
+ ReportProgress (sformat (_("Checking YaS log file %1..."), logfile));
+
+ string YaST_log = (string) WFM::Read (.local.string, logfile);
+
+ integer current_line = -1;
+
+ // cannot open YaST log
+ if (YaST_log == nil) {
+ ret = false;
+ ReportTest (_("Opening file..."), ret);
+ // checking YaST log
+ } else {
+ YaST_log_lines = splitstring (YaST_log, "\n");
+
+ foreach (string one_line, YaST_log_lines, {
+ current_line = current_line + 1;
+
+ // SCR has died, printing the last 15 lines
+ if (regexpmatch (one_line, " Finished YaST2 component ")) {
+ ReportLine (_("SCR process has died, printing the last log lines..."));
+ integer start_line = current_line - 15;
+ PrintLinesFromTo (start_line, current_line);
+
+ ret = false;
+ break;
+ // YaST got killed
+ } else if (regexpmatch (one_line, " got signal ")) {
+ // Print just the last line
+ ReportLine (_("YaST process got killed"));
+ PrintLinesFromTo (current_line, current_line);
+ ret = false;
+ break;
+ }
+ });
+
+ YaST_log_lines = [];
+
+ ReportTest (_("Checking YaST log..."), ret);
+ }
+
+ return ret;
+ }
+
// main test
boolean RunSCRSwitchTests () {
// Test progress
ReportProgress (_("System Checking"));
+
if (! RunSCRSwitchTest_ChrootBinary()) return false;
if (! RunSCRSwitchTest_ChrootPath()) return false;
if (! RunSCRSwitchTest_ListFilesInChroot()) return false;
@@ -400,6 +510,8 @@
// checking all mandatory packages
if (! RunSCRSwitchTest_DoNeededRPMsCheck()) return false;
+ if (! RunSCRSwitchTest_SCRChrootYaSTLog()) return false;
+
// Add new checks here...
return true;
@@ -408,20 +520,71 @@
// <-- Tests
/* ********************************************************************* */
-
+
// --> Special Functions
+ /**
+ * Copy YaST logs from the just installed system to inst-sys
+ */
void CopyY2logsFromSCRToInstSys () {
+ // where SCR logs are stored now
string scr_logs_directory = sformat ("%1%2", chroot_path, yast_logs);
- string command = sformat ("cp -avr '%1' '%2InstalledSystemLogs'", scr_logs_directory, yast_logs);
+ // where to copy them
+ string copy_to_directory = sformat ("%1InstalledSystemLogs", yast_logs);
+
+ string command = sformat (
+ "cp -avr '%1' '%2'",
+ scr_logs_directory, copy_to_directory
+ );
- y2milestone("Running command: %1 -> %2", command,
- SCR::Execute (.target.bash_output, command)
+ y2milestone ("Copying YaST logs from the system to inst-sys: %1 -> %2", command,
+ WFM::Execute (.local.bash_output, command)
);
}
-
+
+ integer FindSCRPID () {
+ map cmd = (map) WFM::Execute (
+ .local.bash_output,
+ "LC_ALL=C /bin/ps a | grep 'scr stdio' | grep -v 'grep'"
+ );
+
+ if (cmd["exit"]:-1 != 0) {
+ y2error ("Cannot find scr process");
+ return -1;
+ }
+
+ list <string> outlines = filter (string one_outline, splitstring (cmd["stdout"]:"", "\n"), {
+ return one_outline != "";
+ });
+ string outline = outlines[size (outlines) - 1]:"";
+
+ if (! regexpmatch (outline, "^[[:digit:]]+")) {
+ y2error ("No PID in %1", outline);
+ return -1;
+ }
+
+ outline = regexpsub (outline, "^([[:digit:]]+)[[:space:]].*", "\\1");
+
+ integer ret = tointeger (outline);
+ y2milestone ("SCR PID: %1", ret);
+
+ return ret;
+ }
+
+ // This is potentially insecure
+ void SwitchY2Debug (integer PID) {
+ if (PID == nil) {
+ y2error ("PID cannot be: %1", PID);
+ return;
+ }
+
+ string cmd = sformat ("kill -s USR1 %1", PID);
+
+ y2milestone ("Adjusting Y2DEBUG >%1<: %2", cmd, WFM::Execute (.local.bash_output, cmd));
+ }
+
// <-- Special Functions
-
+
/* ********************************************************************* */
/**
@@ -452,6 +615,7 @@
WFM::SCRSetDefault (new_SCR);
// Copy all YaST log files from SCR to Inst-Sys
+ // before SCR test
CopyY2logsFromSCRToInstSys();
y2milestone("* ---------- Debugger Start ---------- *");
@@ -471,5 +635,9 @@
WFM::SCRClose (new_SCR);
// Set the previous one as the default
WFM::SCRSetDefault (old_SCR);
+
+ // Copy all YaST log files from SCR to Inst-Sys
+ // after SCR tests
+ CopyY2logsFromSCRToInstSys();
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.17.19/VERSION new/yast2-installation-2.17.20/VERSION
--- old/yast2-installation-2.17.19/VERSION 2008-10-08 12:58:43.000000000 +0200
+++ new/yast2-installation-2.17.20/VERSION 2008-10-09 20:19:19.000000000 +0200
@@ -1 +1 @@
-2.17.19
+2.17.20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org