Skip to content
Browse files

Merge pull request #1 from varkoly/master

I think it can be merged
  • Loading branch information...
2 parents 1e43fc1 + c7d9ea7 commit 243972e82c8e8706283257dd9d77a4cbd05967d1 @jsuchome jsuchome committed
Showing with 16 additions and 18 deletions.
  1. +6 −0 package/yast2-mail.changes
  2. +7 −15 src/Mail.ycp
  3. +1 −1 src/MailServer.ycp
  4. +1 −1 src/ui.ycp
  5. +1 −1 src/widgets.ycp
View
6 package/yast2-mail.changes
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+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
- merged proofread texts
View
22 src/Mail.ycp
@@ -50,7 +50,7 @@
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;
@@ -58,7 +58,7 @@
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 ]);
View
2 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;
View
2 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));
}
}
View
2 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
];
}

0 comments on commit 243972e

Please sign in to comment.
Something went wrong with that request. Please try again.