Mailinglist Archive: yast-commit (883 mails)

< Previous Next >
[yast-commit] r57830 - in /branches/SuSE-SLE-10-SP3-Branch/registration: ./ package/ src/clients/ src/modules/ src/yastbrowser/ src/yastbrowser/chrome/ src/yastbrowser/components/ src/yastbrowser/defaults/prefer...
  • From: jdsn@xxxxxxxxxxxxxxxx
  • Date: Wed, 01 Jul 2009 15:07:40 -0000
  • Message-id: <E1MM1PR-0001ie-1R@xxxxxxxxxxxxxxxx>
Author: jdsn
Date: Wed Jul 1 17:07:40 2009
New Revision: 57830

URL: http://svn.opensuse.org/viewcvs/yast?rev=57830&view=rev
Log:
backported yastbrowser from code11 to work with xulrunner 1.9 (bnc#513884)
backported xen detection from code11 (bnc#418287)
fixed status message for no added update server (bnc#461654)
2.13.23

Modified:
branches/SuSE-SLE-10-SP3-Branch/registration/VERSION

branches/SuSE-SLE-10-SP3-Branch/registration/package/yast2-registration.changes

branches/SuSE-SLE-10-SP3-Branch/registration/src/clients/inst_suse_register.ycp
branches/SuSE-SLE-10-SP3-Branch/registration/src/modules/Register.ycp
branches/SuSE-SLE-10-SP3-Branch/registration/src/yastbrowser/application.ini

branches/SuSE-SLE-10-SP3-Branch/registration/src/yastbrowser/chrome/classic-browser.jar

branches/SuSE-SLE-10-SP3-Branch/registration/src/yastbrowser/chrome/en-US.jar

branches/SuSE-SLE-10-SP3-Branch/registration/src/yastbrowser/chrome/yastbrowser.jar

branches/SuSE-SLE-10-SP3-Branch/registration/src/yastbrowser/components/nsCmdlineHandler.js

branches/SuSE-SLE-10-SP3-Branch/registration/src/yastbrowser/defaults/preferences/yastbrowser-prefs.js

Modified: branches/SuSE-SLE-10-SP3-Branch/registration/VERSION
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/registration/VERSION?rev=57830&r1=57829&r2=57830&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP3-Branch/registration/VERSION (original)
+++ branches/SuSE-SLE-10-SP3-Branch/registration/VERSION Wed Jul 1 17:07:40
2009
@@ -1 +1 @@
-2.13.22
+2.13.23

Modified:
branches/SuSE-SLE-10-SP3-Branch/registration/package/yast2-registration.changes
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/registration/package/yast2-registration.changes?rev=57830&r1=57829&r2=57830&view=diff
==============================================================================
---
branches/SuSE-SLE-10-SP3-Branch/registration/package/yast2-registration.changes
(original)
+++
branches/SuSE-SLE-10-SP3-Branch/registration/package/yast2-registration.changes
Wed Jul 1 17:07:40 2009
@@ -1,4 +1,13 @@
-------------------------------------------------------------------
+Wed Jul 1 14:58:37 CEST 2009 - jdsn@xxxxxxx
+
+- backported yastbrowser from code11 to work with xulrunner 1.9
+ (bnc#513884)
+- backported xen detection from code11 (bnc#418287)
+- fixed status message for no added update server (bnc#461654)
+- 2.13.23
+
+-------------------------------------------------------------------
Tue Apr 8 16:06:58 CEST 2008 - jdsn@xxxxxxx

- fix SMT certificate installation in autoyast mode (bnc#377929)

Modified:
branches/SuSE-SLE-10-SP3-Branch/registration/src/clients/inst_suse_register.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/registration/src/clients/inst_suse_register.ycp?rev=57830&r1=57829&r2=57830&view=diff
==============================================================================
---
branches/SuSE-SLE-10-SP3-Branch/registration/src/clients/inst_suse_register.ycp
(original)
+++
branches/SuSE-SLE-10-SP3-Branch/registration/src/clients/inst_suse_register.ycp
Wed Jul 1 17:07:40 2009
@@ -62,6 +62,8 @@
return `auto;
}

+ boolean IAMSLE = ( (integer) SCR::Execute(.target.bash, " [ -e
/usr/share/applications/YaST2/customer_center.desktop ] ") == 0 ? true:false );
+
// Register::initialize() is mandatory - never remove it
Register::initialize();

@@ -100,6 +102,8 @@
string nccc_success_msg = _("Your configuration was successful.");
string nccc_success_server_added = _("An update server has been added to
your configuration.");
string nccc_error_no_server_added = _("No update server could be added to
your configuration.");
+ // no source changes is not an error - adding a new message (bnc#461654)
+ string nccc_no_source_changes = _("Software repositories did not need to
be changed.");
/* caption for details view */
string success_detail_label =_("New Update Server");

@@ -543,6 +547,7 @@

boolean loopend = false;
any ret = nil;
+ symbol xenType = nil;


/* -------------------------------- PROGRAM LOGIC START
----------------------------------------------------------- */
@@ -613,6 +618,65 @@
{
if ( configure_status == true )
{
+
+ // backport XEN detection from CODE11 (bnc#418287)
+ if ( IAMSLE && xenType == nil )
+ {
+ // once checking for XEN (bnc#418287)
+ xenType = Register::xenType();
+
+ if ( xenType == `xen0 )
+ {
+ string installPackage = "xen-tools";
+ if ( ! Package::Installed(installPackage))
+ {
+ y2milestone("Xen dom0 detected. Asking the user if
the following packages should be installed: %1", installPackage);
+ Package::InstallMsg(installPackage, _("Xen Dom0
detected. The following package needs to be installed."));
+ }
+ else
+ {
+ y2milestone("All needed packages are already
installed: %1", installPackage);
+ }
+ }
+ else if ( xenType == `xenU )
+ {
+ string installPackage = "xen-tools-domU";
+ string removePackage = "xen-tools";
+
+ string xenDomU = _("Xen DomU detected.");
+ string installMsg = xenDomU + "<br>" + _("The
following package needs to be installed.") +
+ "<br>" + sformat("%1",
installPackage); // (bnc#444638)
+ string removeMsg = xenDomU + "<br>" +
+ sformat(_("To count this installation correctly the
package %1 needs to be installed."), installPackage ) +
+ "<br>" + _("Therefore the following package needs
to be removed first.") +
+ "<br>" + sformat("%1", removePackage); //
(bnc#444638)
+
+
+ Package::RemoveMsg(removePackage, removeMsg);
+
+ if ( ! Package::Installed(removePackage) )
+ {
+ if ( Package::InstallMsg(installPackage,
installMsg ) )
+ { y2milestone("Sucessfully installed: %1",
installPackage); }
+ else
+ { y2error("Could not install: %1",
installPackage); }
+ }
+ else
+ {
+ y2error("In a Xen DomU package %1 is installed
rather than %2. Registration will continue nevertheless.", removePackage,
installPackage);
+ Popup::Notify( xenDomU + "\n" +
+ sformat(_("The package %1 should have been
installed and %2 removed."), installPackage, removePackage ) +
+ "\n" + _("Registration will continue now
although the registration server may miscount this installation.")
+ );
+ }
+ }
+ else if ( xenType == nil )
+ {
+ y2error("Detecting XEN failed. Assuming XEN is
disabled. Maybe the registration will not count this machine correctly.");
+ xenType = `unknown;
+ }
+ }
+
// remove the zmd flag file (requested by mvidner)
SCR::Execute(.target.bash, " rm -f
/var/lib/zypp/zmd_updated_the_sources " );

@@ -762,7 +826,7 @@
}
else
{
- Popup::Error(nccc_error_no_server_added);
+ Popup::Message(nccc_no_source_changes);
}

// we are done, end of loop

Modified: branches/SuSE-SLE-10-SP3-Branch/registration/src/modules/Register.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/registration/src/modules/Register.ycp?rev=57830&r1=57829&r2=57830&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP3-Branch/registration/src/modules/Register.ycp
(original)
+++ branches/SuSE-SLE-10-SP3-Branch/registration/src/modules/Register.ycp Wed
Jul 1 17:07:40 2009
@@ -24,6 +24,7 @@
import "ProductFeatures";
import "SourceManager";
import "RegisterCert";
+import "Arch";


// --------------------------------------------------------------
@@ -222,6 +223,44 @@
}


+/*
+ * setupRegistrationServer()
+ *
+ * write SMT server settings to (FATE #302966)
+ * @return symbol that says if we can perform the registration
+ *
+ */
+global symbol xenType()
+{
+ y2milestone("Checking if this machine is a XEN instance or host.");
+
+ if ( Arch::is_xen() )
+ {
+ y2milestone("XEN enabled. Now detecting type.");
+
+ if ( Arch::is_xen0() )
+ {
+ y2milestone("Detected XEN0.");
+ return `xen0;
+ }
+ else if ( Arch::is_xenU() )
+ {
+ y2milestone("Detected XENU");
+ return `xenU;
+ }
+ }
+ else
+ {
+ y2milestone("XEN is disabled.");
+ return `noXen;
+ }
+
+ y2error("An error occurred while detecting XEN. Assuming: XEN is
disabled.");
+ return `unknown;
+}
+
+
+

/*
* setupRegistrationServer()

Modified:
branches/SuSE-SLE-10-SP3-Branch/registration/src/yastbrowser/application.ini
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/registration/src/yastbrowser/application.ini?rev=57830&r1=57829&r2=57830&view=diff
==============================================================================
---
branches/SuSE-SLE-10-SP3-Branch/registration/src/yastbrowser/application.ini
(original)
+++
branches/SuSE-SLE-10-SP3-Branch/registration/src/yastbrowser/application.ini
Wed Jul 1 17:07:40 2009
@@ -8,15 +8,15 @@
Name=Browser
;
; This field specifies your application's version. This field is optional.
-Version=0.1
+Version=0.3
;
; This field specifies your application's build ID (timestamp). This field is
; required.
-BuildID=2006031000
+BuildID=2008102400
;
; This field specifies a compact copyright notice for your application. This
; field is optional.
-Copyright=Copyright (c) 2006 SUSE Linux Products GmbH
+Copyright=Copyright (c) 2006-2008 SUSE Linux Products GmbH
;
; This ID is just an example. Every XUL app ought to have it's own unique ID.
; You can use the microsoft "guidgen" or "uuidgen" tools, or go on
@@ -26,12 +26,17 @@
[Gecko]
;
; This field is required. It specifies the minimum Gecko version that this
-; application requires. Specifying 1.8 matches all releases with a version
-; prefixed by 1.8 (e.g., 1.8a4, 1.8b, 1.8.2).
-MinVersion=1.8
+; application requires.
+MinVersion=1.9
;
; This field is optional. It specifies the maximum Gecko version that this
; application requires. It should be specified if your application uses
-; unfrozen interfaces. Specifying 1.8 matches all releases with a version
-; prefixed by 1.8 (e.g., 1.8a4, 1.8b, 1.8.2).
-MaxVersion=1.9
+; unfrozen interfaces.
+MaxVersion=1.9.*
+
+;[Shell]
+;
+; This field specifies the location of your application's main icon with file
+; extension excluded. NOTE: Unix style file separators are required. This
+; field is optional.
+;Icon=chrome/icons/default/simple

Modified:
branches/SuSE-SLE-10-SP3-Branch/registration/src/yastbrowser/chrome/classic-browser.jar
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/registration/src/yastbrowser/chrome/classic-browser.jar?rev=57830&r1=57829&r2=57830&view=diff
==============================================================================
Binary files - no diff available.

Modified:
branches/SuSE-SLE-10-SP3-Branch/registration/src/yastbrowser/chrome/en-US.jar
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/registration/src/yastbrowser/chrome/en-US.jar?rev=57830&r1=57829&r2=57830&view=diff
==============================================================================
Binary files - no diff available.

Modified:
branches/SuSE-SLE-10-SP3-Branch/registration/src/yastbrowser/chrome/yastbrowser.jar
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/registration/src/yastbrowser/chrome/yastbrowser.jar?rev=57830&r1=57829&r2=57830&view=diff
==============================================================================
Binary files - no diff available.

Modified:
branches/SuSE-SLE-10-SP3-Branch/registration/src/yastbrowser/components/nsCmdlineHandler.js
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/registration/src/yastbrowser/components/nsCmdlineHandler.js?rev=57830&r1=57829&r2=57830&view=diff
==============================================================================
---
branches/SuSE-SLE-10-SP3-Branch/registration/src/yastbrowser/components/nsCmdlineHandler.js
(original)
+++
branches/SuSE-SLE-10-SP3-Branch/registration/src/yastbrowser/components/nsCmdlineHandler.js
Wed Jul 1 17:07:40 2009
@@ -20,7 +20,7 @@
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
- * Wolfgang Rosenauer <stark@xxxxxxx>
+ * Wolfgang Rosenauer <wr@xxxxxxxxxxxxx>
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or

Modified:
branches/SuSE-SLE-10-SP3-Branch/registration/src/yastbrowser/defaults/preferences/yastbrowser-prefs.js
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/registration/src/yastbrowser/defaults/preferences/yastbrowser-prefs.js?rev=57830&r1=57829&r2=57830&view=diff
==============================================================================
---
branches/SuSE-SLE-10-SP3-Branch/registration/src/yastbrowser/defaults/preferences/yastbrowser-prefs.js
(original)
+++
branches/SuSE-SLE-10-SP3-Branch/registration/src/yastbrowser/defaults/preferences/yastbrowser-prefs.js
Wed Jul 1 17:07:40 2009
@@ -1,5 +1,10 @@
pref("toolkit.defaultChromeURI",
"chrome://yastbrowser/content/yastbrowser.xul");
-pref("general.useragent.extra.yastbrowser", "YaST-Browser/0.1");
+pref("general.useragent.extra.yastbrowser", "YaST-Browser/0.3");
pref("security.warn_entering_secure", false);
pref("dom.allow_scripts_to_close_windows", true);
pref("network.proxy.type", 5);
+pref("accessibility.typeaheadfind.timeout", 5000);
+pref("accessibility.typeaheadfind.flashBar", 1);
+pref("accessibility.typeaheadfind", false);
+pref("accessibility.typeaheadfind.linksonly", false);
+pref("accessibility.typeaheadfind.casesensitive", 0);

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

< Previous Next >
This Thread
  • No further messages