Mailinglist Archive: yast-commit (723 mails)

< Previous Next >
[yast-commit] r47309 - in /trunk/registration: ./ agents/ doc/ src/ src/clients/ src/config/ src/control/ src/modules/ src/yastbrowser/ src/yastbrowser/chrome/ src/yastbrowser/components/ src/yastbrowser/default...
  • From: coolo@xxxxxxxxxxxxxxxx
  • Date: Tue, 06 May 2008 09:14:26 -0000
  • Message-id: <20080506091426.ABF0026F2F@xxxxxxxxxxxxxxxx>
Author: coolo
Date: Tue May 6 11:14:26 2008
New Revision: 47309

URL: http://svn.opensuse.org/viewcvs/yast?rev=47309&view=rev
Log:
sync with what's in autobuild

Added:
trunk/registration/src/clients/piwo.ycp
Modified:
trunk/registration/ (props changed)
trunk/registration/agents/ (props changed)
trunk/registration/doc/ (props changed)
trunk/registration/src/ (props changed)
trunk/registration/src/clients/ (props changed)
trunk/registration/src/clients/inst_suse_register.ycp
trunk/registration/src/config/ (props changed)
trunk/registration/src/control/ (props changed)
trunk/registration/src/modules/ (props changed)
trunk/registration/src/yastbrowser/ (props changed)
trunk/registration/src/yastbrowser/chrome/ (props changed)
trunk/registration/src/yastbrowser/components/ (props changed)
trunk/registration/src/yastbrowser/defaults/ (props changed)
trunk/registration/src/yastbrowser/defaults/preferences/ (props changed)

Modified: trunk/registration/src/clients/inst_suse_register.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/clients/inst_suse_register.ycp?rev=47309&r1=47308&r2=47309&view=diff
==============================================================================
--- trunk/registration/src/clients/inst_suse_register.ycp (original)
+++ trunk/registration/src/clients/inst_suse_register.ycp Tue May 6 11:14:26
2008
@@ -137,13 +137,6 @@
Other tools, such as Software Updater in the panel, can still be
used. Alternatively, cancel then register through YaST as root
so the sources are available to all tools.");
- /* nonroot-message using repository instead of source*/
- string nonroot_message_repo = _("Registering as a regular user does not
include the update repository
-in the Online Update YaST module. If you continue and later want
-to update with Online Update, the repository must be added manually.
-Other tools, such as Software Updater in the panel, can still be
-used. Alternatively, cancel then register through YaST as root
-so the repositories are available to all tools.");



@@ -197,14 +190,6 @@
This option does not remove any sources added manually.
</p>");

-string help_para5_repo = _("<p>
-<b>Regularly Synchronize with the Customer Center</b> checks that your update
-repositories are still valid and adds any new ones that may be available.
-It additionally sends any modifications to your included data to Novell, such
-as hardware information if <b>Hardware Information</b> is activated.
-This option does not remove any repositories added manually.
-</p>");
-
string help = help_title + help_para1 + help_para2 +
(Register::display_forcereg ? help_para3:"") + help_para4;


@@ -381,19 +366,12 @@
/* ---------------------------------- LOCAL FUNCTIONS
------------------------------------------------------------ */


-boolean report_error(string errMsg, string errMsgDetail)
+boolean report_error()
{
// function to display an error message
// and offer a detailled view of the error message

UI::OpenDialog(error_message);
- if (errMsg != nil)
- {
- // use this function for custom error messages as well (bnc#308117)
- UI::ChangeWidget(`id(`err_description), `Value, errMsg);
- UI::RecalcLayout();
- UI::ChangeWidget(`id(`back), `Enabled, false );
- }
UI::SetFocus (`id (`skip ));
symbol retry = nil;

@@ -406,10 +384,6 @@
{
// switch to plaintext if error output is one or two lines
(#239570)
string error_msg_details = (string)information_data["stderr"]:"no
error message available";
- if (errMsgDetail != nil)
- {
- error_msg_details = errMsgDetail;
- }
if ( contains( [0,1], size(splitstring(error_msg_details,"\n")) ) )
UI::OpenDialog(error_message_details);
else
@@ -644,7 +618,7 @@
if (! ( information_data["exit"]:"99" == "199" &&
information_data["stdout"]:"aborted" == "aborted" &&
information_data["stderr"]:"aborted" == "aborted" )
)
- report_error(nil, nil);
+ report_error();
}

}
@@ -814,8 +788,7 @@
// show a message when there are no products to register
if (information_data["exit"]:"99" == "101")
{
- //Popup::Message(no_product_msg);
- report_error(no_product_msg,
information_data["stderr"]:"");
+ Popup::Message(no_product_msg);
loopend = true;
}

@@ -847,7 +820,7 @@
)
{
// display error message
- report_error(nil, nil);
+ report_error();
}

}

Added: trunk/registration/src/clients/piwo.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/clients/piwo.ycp?rev=47309&view=auto
==============================================================================
--- trunk/registration/src/clients/piwo.ycp (added)
+++ trunk/registration/src/clients/piwo.ycp Tue May 6 11:14:26 2008
@@ -0,0 +1,35 @@
+/**
+ * File: clients/piwo.ycp
+ * Summary: Run PostInstallWOrkflow
+ * Authors: J. Daniel Schmidt <jdsn@xxxxxxx>
+ *
+ * $Id: piwo.ycp 41800 2008-04-24 17:00:00Z jdsn $
+ *
+ */
+
+{
+
+import "Mode";
+import "Wizard";
+import "ProductControl";
+textdomain "piwo";
+
+string piwoControlFile = "/usr/share/YaST2/control/piwo.xml";
+
+
+Wizard::CreateDialog();
+
+
+ProductControl::custom_control_file = piwoControlFile;
+
+if (!ProductControl::Init())
+{
+ y2error("control file %1 not found", ProductControl::custom_control_file );
+}
+
+
+symbol ret = ProductControl::Run();
+
+return ret;
+
+}

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages