Merge pull request #1 from varkoly/master

I think it can be merged

package/yast2-mail.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov  8 11:30:50 UTC 2012 - varkoly@suse.com
+
+- bnc#784659 - remove SuSEconfig calls from yast2-mail
+- bnc#782048 - postfix uses /sbin/conf.d
+
 -------------------------------------------------------------------
 Thu Mar 29 15:24:06 CEST 2012 - jsuchome@suse.cz
 

src/Mail.ycp

@@ -50,15 +50,15 @@
     global symbol mta = nil;
 
     /**
-     *	If true, don't run SuSEconfig or restart the services.
+     *	If true, don't restart the services.
      *  Autoinstall uses this to do  all in one place.
      */
     global boolean write_only = false;
 
     boolean create_config = false;
     /**
      * If MAIL_CREATE_CONFIG is not yes, the user
-     * does not want SuSEconfig to modify sendmail.cf/main.cf.
+     * does not want us to modify sendmail.cf/main.cf.
      * So we will warn him before setting it to yes.
      * @return	Is it yes?
      */
@@ -1092,19 +1092,11 @@ a fixed format to be readable by YaST.  For details, see
      * Part of Write.
      * @return success
      */
-    global define boolean WriteSuSEconfig () ``{
-	//run SuSEconfig with the necessary modules
-	// TODO other modules using FROM_HEADER?
+    global define boolean WriteConfig () ``{
 	integer ret = 0;
-	if (mta == `sendmail)
-	{
-	    ret = (integer)
-		SCR::Execute(.target.bash,"/sbin/SuSEconfig --module sendmail");
-	}
-	else if (mta == `postfix)
+	if (mta == `postfix)
 	{
-	    ret = (integer)
-		SCR::Execute(.target.bash, "/usr/sbin/SuSEconfig.postfix");
+	    ret = (integer) SCR::Execute(.target.bash, "/usr/sbin/config.postfix");
 	}
 	else
 	{
@@ -1114,7 +1106,7 @@ a fixed format to be readable by YaST.  For details, see
 	if (ret != 0)
 	{
 	    // Translators: error message
-	    Report::Error (_("Error running SuSEconfig."));
+	    Report::Error (_("Error running config.postfix"));
 	    return false;
 	}
 	return true;
@@ -1216,7 +1208,7 @@ a fixed format to be readable by YaST.  For details, see
 	if (! write_only)
 	{
 	    // Translators: progress label
-	    stages = add (stages, [ _("Running SuSEconfig"), WriteSuSEconfig ]);
+	    stages = add (stages, [ _("Running Config Postfix"), WriteConfig ]);
 
 	    // Translators: progress label
 	    stages = add (stages, [ _("Restarting services"), WriteServices ]);

src/MailServer.ycp

@@ -43,7 +43,7 @@ global boolean proposal_valid = false;
 
 /**
  * Write only, used during autoinstallation.
- * Don't run services and SuSEconfig, it's all done at one place.
+ * Don't run services, it's all done at one place.
  */
 global boolean write_only = false;
 

src/ui.ycp

@@ -76,7 +76,7 @@ define symbol ReadDialog () ``{
 	    was_ok = Popup::ContinueCancel (sformat (_("The setting %1 is turned off. You have
 probably modified the configuration files directly.
 If you continue, it will be turned on and
-SuSEconfig will overwrite manual changes.
+Config Postfix will overwrite manual changes.
 "), setting));
 	}
     }

src/widgets.ycp

@@ -653,7 +653,7 @@ define list Choices_delivery_mode () ``{
 	    `item (`id (`dm_cyrus), _("To Cyrus IMAP Server")),
 	    // TODO: should check whether cyrus-imapd is installed.
 	    // And show the choice only if it is.
-	    // But SuSEconfig.postfix falls back to local if it's not, so OK
+	    // But config.postfix falls back to local if it's not, so OK
     ];
 }