Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Fixing bugs coused by removing SuSEconfig

bnc#784659 - remove SuSEconfig calls from yast2-mail
  • Loading branch information...
commit 0ac76374b2b7ea031a0b4dc03024198be62cee8f 1 parent 1e43fc1
Peter Varkoly authored November 08, 2012
22  src/Mail.ycp
@@ -50,7 +50,7 @@
50 50
     global symbol mta = nil;
51 51
 
52 52
     /**
53  
-     *	If true, don't run SuSEconfig or restart the services.
  53
+     *	If true, don't restart the services.
54 54
      *  Autoinstall uses this to do  all in one place.
55 55
      */
56 56
     global boolean write_only = false;
@@ -58,7 +58,7 @@
58 58
     boolean create_config = false;
59 59
     /**
60 60
      * If MAIL_CREATE_CONFIG is not yes, the user
61  
-     * does not want SuSEconfig to modify sendmail.cf/main.cf.
  61
+     * does not want us to modify sendmail.cf/main.cf.
62 62
      * So we will warn him before setting it to yes.
63 63
      * @return	Is it yes?
64 64
      */
@@ -1092,19 +1092,11 @@ a fixed format to be readable by YaST.  For details, see
1092 1092
      * Part of Write.
1093 1093
      * @return success
1094 1094
      */
1095  
-    global define boolean WriteSuSEconfig () ``{
1096  
-	//run SuSEconfig with the necessary modules
1097  
-	// TODO other modules using FROM_HEADER?
  1095
+    global define boolean WriteConfig () ``{
1098 1096
 	integer ret = 0;
1099  
-	if (mta == `sendmail)
1100  
-	{
1101  
-	    ret = (integer)
1102  
-		SCR::Execute(.target.bash,"/sbin/SuSEconfig --module sendmail");
1103  
-	}
1104  
-	else if (mta == `postfix)
  1097
+	if (mta == `postfix)
1105 1098
 	{
1106  
-	    ret = (integer)
1107  
-		SCR::Execute(.target.bash, "/usr/sbin/SuSEconfig.postfix");
  1099
+	    ret = (integer) SCR::Execute(.target.bash, "/usr/sbin/config.postfix");
1108 1100
 	}
1109 1101
 	else
1110 1102
 	{
@@ -1114,7 +1106,7 @@ a fixed format to be readable by YaST.  For details, see
1114 1106
 	if (ret != 0)
1115 1107
 	{
1116 1108
 	    // Translators: error message
1117  
-	    Report::Error (_("Error running SuSEconfig."));
  1109
+	    Report::Error (_("Error running config.postfix"));
1118 1110
 	    return false;
1119 1111
 	}
1120 1112
 	return true;
@@ -1216,7 +1208,7 @@ a fixed format to be readable by YaST.  For details, see
1216 1208
 	if (! write_only)
1217 1209
 	{
1218 1210
 	    // Translators: progress label
1219  
-	    stages = add (stages, [ _("Running SuSEconfig"), WriteSuSEconfig ]);
  1211
+	    stages = add (stages, [ _("Running Config Postfix"), WriteConfig ]);
1220 1212
 
1221 1213
 	    // Translators: progress label
1222 1214
 	    stages = add (stages, [ _("Restarting services"), WriteServices ]);
2  src/MailServer.ycp
@@ -43,7 +43,7 @@ global boolean proposal_valid = false;
43 43
 
44 44
 /**
45 45
  * Write only, used during autoinstallation.
46  
- * Don't run services and SuSEconfig, it's all done at one place.
  46
+ * Don't run services, it's all done at one place.
47 47
  */
48 48
 global boolean write_only = false;
49 49
 
2  src/ui.ycp
@@ -76,7 +76,7 @@ define symbol ReadDialog () ``{
76 76
 	    was_ok = Popup::ContinueCancel (sformat (_("The setting %1 is turned off. You have
77 77
 probably modified the configuration files directly.
78 78
 If you continue, it will be turned on and
79  
-SuSEconfig will overwrite manual changes.
  79
+Config Postfix will overwrite manual changes.
80 80
 "), setting));
81 81
 	}
82 82
     }
2  src/widgets.ycp
@@ -653,7 +653,7 @@ define list Choices_delivery_mode () ``{
653 653
 	    `item (`id (`dm_cyrus), _("To Cyrus IMAP Server")),
654 654
 	    // TODO: should check whether cyrus-imapd is installed.
655 655
 	    // And show the choice only if it is.
656  
-	    // But SuSEconfig.postfix falls back to local if it's not, so OK
  656
+	    // But config.postfix falls back to local if it's not, so OK
657 657
     ];
658 658
 }
659 659
 

0 notes on commit 0ac7637

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