Merge pull request #15 from jsuchome/master

removed SuSEconfig calls review OK, merging to the master
yast · Oct 18, 2012 · 1939f23 · 1939f23
2 parents f38f022 + b7d32bd
commit 1939f23
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 56 deletions.
diff --git a/library/packages/doc/index.html b/library/packages/doc/index.html
@@ -86,7 +86,6 @@ <h3>Testing</h3>
 
 <h3>Other</h3>
 <ul>
-<li>void RunSUSEconfig();
 <li>boolean LastOperationCanceled();
 <li>boolean InstallKernel (list<&lt;string&gt;> kernel_modules);
 </ul>

diff --git a/library/packages/doc/packages-section.xml b/library/packages/doc/packages-section.xml
@@ -136,9 +136,6 @@ packages);</para>
     <section>
       <title>Other</title>
       <itemizedlist spacing="compact">
-        <listitem>
-          <para>void RunSUSEconfig();</para>
-        </listitem>
         <listitem>
           <para id="Module_Package_LastOperationCanceled">boolean Package::LastOperationCanceled();</para>
         </listitem>

diff --git a/library/packages/src/PackageSystem.ycp b/library/packages/src/PackageSystem.ycp
@@ -329,17 +329,6 @@ to be solved manually in the software manager."));
     });
     if(ok != true) return false;
 
-    // Only run SUSEconfig if any packages were installed?
-    // No, deleted packages are not covered by this.
-    // if (true || result[0]:-1 > 0)
-
-    // But omit it during installation, one is run at its end.
-    // #25071
-    if (!Stage::initial () && !Stage::cont ())
-    {
-	RunSUSEconfig ();
-    }
-
     // a package or a patch was installed, may be that there is a new yast agent
     if (any_to_install)
     {

diff --git a/library/packages/src/common.ycp b/library/packages/src/common.ycp
@@ -225,44 +225,6 @@ global boolean RemoveAll(list<string> packages) {
     return RemoveAllMsg(packages, nil);
 }
 
-/**
- * Run SUSEconfig, create new wizard dialog before it,
- * close after it is finished
- */
-global void RunSUSEconfig() {
-    if (Mode::commandline())
-    {
-	// in the commandline mode start SuSEconfig in background
-	SCR::Execute(.background.run_output, "/sbin/SuSEconfig");
-
-	list<string> script_out = [];
-	symbol ret = nil;
-
-	// print SuSEconfig output
-	while((boolean)SCR::Read(.background.output_open) || ((integer)SCR::Read(.background.newlines) > 0))
-	{
-	    script_out = (list<string>)SCR::Read(.background.newout);
-
-	    foreach(string line, script_out, {
-		    CommandLine::PrintVerbose(line);
-		}
-	    );
-
-	    while ((integer)SCR::Read(.background.newlines) == 0 && (boolean)SCR::Read(.background.output_open))
-	    {
-		sleep(200);	// small wait
-	    }
-	}
-    }
-    else
-    {
-	Wizard::CreateDialog ();
-	// inst_suseconfig returns `auto or `next
-	// (update mode or Args(2) is true) => no error checking
-	WFM::CallFunction("inst_suseconfig", [$["enable_back":false, "enable_next":false]]);
-	Wizard::CloseDialog ();
-    }
-}
 
 /**
  * Return result of the last operation

diff --git a/library/packages/testsuite/packages-test.ycp b/library/packages/testsuite/packages-test.ycp
@@ -88,9 +88,6 @@ Package::RemoveAll(el);
 
 Package::DoInstallAndRemove([], []);
 
-/* Other */
-Package::RunSUSEconfig();
-
 }
 
 Popup::AnyMessage("Package Testsuite", sformat("Number of Successes: %1

diff --git a/package/yast2.changes b/package/yast2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Oct 11 14:49:04 CEST 2012 - jsuchome@suse.cz
+
+- removed calls to /sbin/SuSEconfig, packages should care of 
+  updating configurations on their own
+
 -------------------------------------------------------------------
 Mon Oct 01 06:17:16 UTC 2012 - mfilka@suse.com