July 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r57839 - in /branches/SuSE-Code-11-Branch/yast2: VERSION library/gpg/src/GPG.ycp package/yast2.changes
by jsuchome＠svn.opensuse.org 02 Jul '09

02 Jul '09

Author: jsuchome Date: Thu Jul 2 12:28:09 2009 New Revision: 57839 URL: http://svn.opensuse.org/viewcvs/yast?rev=57839&view=rev Log: - do not ask for the same password again and again (bnc#517382) - 2.17.69 Modified: branches/SuSE-Code-11-Branch/yast2/VERSION branches/SuSE-Code-11-Branch/yast2/library/gpg/src/GPG.ycp branches/SuSE-Code-11-Branch/yast2/package/yast2.changes Modified: branches/SuSE-Code-11-Branch/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/yast2/VER… ============================================================================== --- branches/SuSE-Code-11-Branch/yast2/VERSION (original) +++ branches/SuSE-Code-11-Branch/yast2/VERSION Thu Jul 2 12:28:09 2009 @@ -1 +1 @@ -2.17.68 +2.17.69 Modified: branches/SuSE-Code-11-Branch/yast2/library/gpg/src/GPG.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/yast2/lib… ============================================================================== --- branches/SuSE-Code-11-Branch/yast2/library/gpg/src/GPG.ycp (original) +++ branches/SuSE-Code-11-Branch/yast2/library/gpg/src/GPG.ycp Thu Jul 2 12:28:09 2009 @@ -307,7 +307,7 @@ } // use the passphrase - map out = callGPG(sformat("--detach-sign -u '%1' --no-tty --command-fd=0 %2 '%3' < '%4'", String::Quote(keyid), (ascii_signature ? "-a" : ""), String::Quote(file), String::Quote(tmpfile))); + map out = callGPG(sformat("--detach-sign -u '%1' --no-tty --batch --command-fd=0 --passphrase-fd 0 %2 '%3' < '%4'", String::Quote(keyid), (ascii_signature ? "-a" : ""), String::Quote(file), String::Quote(tmpfile))); return out["exit"]:-1 == 0; } Modified: branches/SuSE-Code-11-Branch/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/yast2/pac… ============================================================================== --- branches/SuSE-Code-11-Branch/yast2/package/yast2.changes (original) +++ branches/SuSE-Code-11-Branch/yast2/package/yast2.changes Thu Jul 2 12:28:09 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jul 2 12:14:53 CEST 2009 - jsuchome(a)suse.cz + +- do not ask for the same password again and again (bnc#517382) +- 2.17.69 + +------------------------------------------------------------------- Mon Feb 23 12:41:52 CET 2009 - locilka(a)suse.cz - Fixing ProductControl to avoid leaving a workflow with the `auto -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r57838 - in /trunk/control-center/src: yqdesktopfilesmodel.cpp yqdesktopfilesmodel.h
by kmachalkova＠svn.opensuse.org 02 Jul '09

02 Jul '09

Author: kmachalkova Date: Thu Jul 2 12:12:21 2009 New Revision: 57838 URL: http://svn.opensuse.org/viewcvs/yast?rev=57838&view=rev Log: Helper function (to search icon dirs for given icon name) Modified: trunk/control-center/src/yqdesktopfilesmodel.cpp trunk/control-center/src/yqdesktopfilesmodel.h Modified: trunk/control-center/src/yqdesktopfilesmodel.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/yqdesktopfile… ============================================================================== --- trunk/control-center/src/yqdesktopfilesmodel.cpp (original) +++ trunk/control-center/src/yqdesktopfilesmodel.cpp Thu Jul 2 12:12:21 2009 @@ -239,8 +239,26 @@ else return msgstr; -} +} + +QVariant YQDesktopFilesModel::findIcon( QString &icon ) const +{ + QRegExp extension( "\\.(png|jpg)$", Qt::CaseInsensitive ); + if ( icon.indexOf( extension ) < 0 ) // no .png or .jpg extension? + icon += ".png"; // assume .png + QStringListIterator it(d->icon_dirs); + while (it.hasNext()) + { + QString icondir(it.next()); + if ( QFile::exists(icondir + "/" + icon) ) + { + return QIcon(icondir + "/" + icon); + } + } + return QVariant(); +} + void YQDesktopFilesModel::sort( int, Qt::SortOrder order ) { emit layoutAboutToBeChanged(); @@ -264,19 +282,7 @@ else if ( role == Qt::DecorationRole ) { QString icon = propertyValue( index, "Icon" ).toString(); - QRegExp extension( "\\.(png|jpg)$", Qt::CaseInsensitive ); - if ( icon.indexOf( extension ) < 0 ) // no .png or .jpg extension? - icon += ".png"; // assume .png - QStringListIterator it(d->icon_dirs); - while (it.hasNext()) - { - QString icondir(it.next()); - if ( QFile::exists(icondir + "/" + icon) ) - { - return QIcon(icondir + "/" + icon); - } - } - return QVariant(); + return findIcon( icon ); } else if ( role == Qt::UserRole ) { @@ -343,4 +349,6 @@ d->cache[ fname ] = pm; } } + + #include "yqdesktopfilesmodel.moc" Modified: trunk/control-center/src/yqdesktopfilesmodel.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/yqdesktopfile… ============================================================================== --- trunk/control-center/src/yqdesktopfilesmodel.h (original) +++ trunk/control-center/src/yqdesktopfilesmodel.h Thu Jul 2 12:12:21 2009 @@ -82,6 +82,7 @@ */ QVariant propertyValue( const QModelIndex &index, const QString &key ) const; QVariant translatedPropertyValue( const QModelIndex &index, const QString &key ) const; + QVariant findIcon ( QString &icon ) const; virtual QVariant data( const QModelIndex &index, int role = Qt::DisplayRole ) const; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r57837 - /tags/branch-SLE-10-SP2-2_13_33/ldap-client/
by jsuchome＠svn.opensuse.org 02 Jul '09

02 Jul '09

Author: jsuchome Date: Thu Jul 2 11:48:07 2009 New Revision: 57837 URL: http://svn.opensuse.org/viewcvs/yast?rev=57837&view=rev Log: Created tag branch-SLE-10-SP2-2_13_33 for ldap-client Added: tags/branch-SLE-10-SP2-2_13_33/ldap-client/ - copied from r57836, branches/SuSE-SLE-10-SP2-Branch/ldap-client/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r57836 - /tags/branch-SLE-10-SP2-2_13_33/
by jsuchome＠svn.opensuse.org 02 Jul '09

02 Jul '09

Author: jsuchome Date: Thu Jul 2 11:48:03 2009 New Revision: 57836 URL: http://svn.opensuse.org/viewcvs/yast?rev=57836&view=rev Log: Created tag branch-SLE-10-SP2-2_13_33 Added: tags/branch-SLE-10-SP2-2_13_33/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r57835 - in /branches/SuSE-SLE-10-SP2-Branch/ldap-client: VERSION package/yast2-ldap-client.changes src/Ldap.ycp
by jsuchome＠svn.opensuse.org 02 Jul '09

02 Jul '09

Author: jsuchome Date: Thu Jul 2 11:47:56 2009 New Revision: 57835 URL: http://svn.opensuse.org/viewcvs/yast?rev=57835&view=rev Log: - show port in the server field, read the data if there were not read yet (patch from L3 team, bnc#464203) - 2.13.33 Modified: branches/SuSE-SLE-10-SP2-Branch/ldap-client/VERSION branches/SuSE-SLE-10-SP2-Branch/ldap-client/package/yast2-ldap-client.changes branches/SuSE-SLE-10-SP2-Branch/ldap-client/src/Ldap.ycp Modified: branches/SuSE-SLE-10-SP2-Branch/ldap-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/ldap-c… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/ldap-client/VERSION (original) +++ branches/SuSE-SLE-10-SP2-Branch/ldap-client/VERSION Thu Jul 2 11:47:56 2009 @@ -1 +1 @@ -2.13.32 +2.13.33 Modified: branches/SuSE-SLE-10-SP2-Branch/ldap-client/package/yast2-ldap-client.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/ldap-c… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/ldap-client/package/yast2-ldap-client.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/ldap-client/package/yast2-ldap-client.changes Thu Jul 2 11:47:56 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Feb 11 21:57:00 CET 2009 - jsuchome(a)suse.cz + +- show port in the server field, read the data if there were + not read yet (patch from L3 team, bnc#464203) +- 2.13.33 + +------------------------------------------------------------------- Wed Feb 20 16:07:43 CET 2008 - jsuchome(a)suse.cz - allow more spaces as host name separators (bnc#362946) Modified: branches/SuSE-SLE-10-SP2-Branch/ldap-client/src/Ldap.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/ldap-c… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/ldap-client/src/Ldap.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/ldap-client/src/Ldap.ycp Thu Jul 2 11:47:56 2009 @@ -879,6 +879,12 @@ // this is a hack global define integer GetFirstPort (string servers) ``{ + if (bind_pass == nil && servers == "") + { + y2milestone ("--- server not read yet or empty, reading now"); + servers = ReadLdapConfEntry ("host", ""); + } + list l_servers = splitstring (servers, " \t"); string srv = l_servers[0]:""; if (!issubstring (srv, ":")) @@ -952,7 +958,8 @@ // password entering label `Password(`id(`pw), _("&LDAP Server Password")), // label - `Label (sformat (_("Server: %1"), GetFirstServer (server))), + `Label (sformat (_("Server: %1:%2"), + GetFirstServer (server), GetFirstPort (server))), // label (%1 is admin DN - string) `Label (sformat (_("Administrator: %1"), GetBindDN ())), `HBox( -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r57834 - in /branches/tmp/mvidner/core-dbus-values/dbus/namespace_service/testsuite: t4-bad-params t5-params
by mvidner＠svn.opensuse.org 02 Jul '09

02 Jul '09

Author: mvidner Date: Thu Jul 2 09:52:10 2009 New Revision: 57834 URL: http://svn.opensuse.org/viewcvs/yast?rev=57834&view=rev Log: more test cases Added: branches/tmp/mvidner/core-dbus-values/dbus/namespace_service/testsuite/t4-bad-params (with props) branches/tmp/mvidner/core-dbus-values/dbus/namespace_service/testsuite/t5-params (with props) Added: branches/tmp/mvidner/core-dbus-values/dbus/namespace_service/testsuite/t4-bad-params URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/core-dbus-values/… ============================================================================== --- branches/tmp/mvidner/core-dbus-values/dbus/namespace_service/testsuite/t4-bad-params (added) +++ branches/tmp/mvidner/core-dbus-values/dbus/namespace_service/testsuite/t4-bad-params Thu Jul 2 09:52:10 2009 @@ -0,0 +1,44 @@ +#! /usr/bin/python +# test various kinds of parameter errors +# -bad param type +#TODO for other cases: +# - unknown namespace +# object not found +# etc, check y2errors +import dbus +import unittest + +class BadParams(unittest.TestCase): + def setUp(self): + T_o = dbus.SessionBus().get_object('org.opensuse.YaST.modules', + '/org/opensuse/YaST/modules/TEST') + self.T = dbus.Interface(T_o, 'org.opensuse.YaST.Values') + self.YT = dbus.Interface(T_o, 'org.opensuse.YaST.YCPValues') + + def testRawMissingParam(self): + self.assertRaises(Exception, self.T.ParamMap) + + def testRawTypeMismatch(self): + self.assertRaises(Exception, self.T.ParamMap, "I am a string, not a map") + + def testRawSuperfluousParam(self): + self.assertRaises(Exception, self.T.ParamMap, {"foo":"bar"}, "I am superfluous") + + def testBsvNil(self): + "type is required even for nil, dubious" + self.assertRaises(Exception, self.YT.ParamMap, (True, "", 0)) + + def testBsvTypeRequired(self): + self.assertRaises(Exception, self.YT.ParamMap, (False, "", 0)) + + def testBsvUnknownType(self): + self.assertRaises(Exception, self.YT.ParamMap, (False, "ufo", 0)) + + def testBsvUnimplementedType(self): + self.assertRaises(Exception, self.YT.ParamMap, (False, "byteblock", 0)) + + def testBsvTypeMismatch(self): + self.assertRaises(Exception, self.YT.ParamMap, (False, "string", 42)) + +if __name__ == '__main__': + unittest.main() Added: branches/tmp/mvidner/core-dbus-values/dbus/namespace_service/testsuite/t5-params URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/core-dbus-values/… ============================================================================== --- branches/tmp/mvidner/core-dbus-values/dbus/namespace_service/testsuite/t5-params (added) +++ branches/tmp/mvidner/core-dbus-values/dbus/namespace_service/testsuite/t5-params Thu Jul 2 09:52:10 2009 @@ -0,0 +1,74 @@ +#! /usr/bin/python +import dbus +import unittest + +# define representative values of various types, named after their signatures +b42 = True +y42 = 42 +n42 = 4200 +q42 = 42000 +i42 = 2100000000 +u42 = 4200000000 +x42 = 4200000000000000000 +t42 = 18000000000000000000 +# ^ E P T G M K +d42 = 4.2 +s42 = "fortytwo" +o42 = "/Forty/Two" +g42 = "tatastavi" + +b = True +y = dbus.Byte(y42) +n = dbus.Int16(n42) +q = dbus.UInt16(q42) +i = dbus.Int32(i42) +# TODO make them big enough +u = dbus.UInt32(u42) +x = dbus.Int64(x42) +t = dbus.UInt64(t42) # too big for YCP +d = dbus.Double(d42) +s = dbus.String(s42) +o = dbus.ObjectPath(o42) +g = dbus.Signature(g42) +#v, a + +class ParamPassing(unittest.TestCase): + + def setUp(self): + T_o = dbus.SessionBus().get_object('org.opensuse.YaST.modules', + '/org/opensuse/YaST/modules/TEST') + self.T = dbus.Interface(T_o, 'org.opensuse.YaST.Values') +# self.YT = dbus.Interface(T_o, 'org.opensuse.YaST.YCPValues') + + def testByte(self): + self.assertEqual(self.T.ParamInteger(y), y42) + + def testInt16(self): + self.assertEqual(self.T.ParamInteger(n), n42) + + def testUInt16(self): + self.assertEqual(self.T.ParamInteger(q), q42) + + def testInt32(self): + self.assertEqual(self.T.ParamInteger(i), i42) + + def testUInt32(self): + self.assertEqual(self.T.ParamInteger(u), u42) + + def testInt64(self): + self.assertEqual(self.T.ParamInteger(x), x42) + +# python says: OverflowError: long too big to convert +# def testUInt64(self): +# self.assertEqual(self.T.ParamInteger(t), t42) + + def testDouble(self): + self.assertEqual(self.T.ParamFloat(d), d42) + + def testString(self): + self.assertEqual(self.T.ParamString(s), s42) + + + +if __name__ == '__main__': + unittest.main() -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r57833 - in /branches/SuSE-SLE-10-SP3-Branch/registration: ./ agents/ doc/ package/ src/ src/clients/ src/config/ src/modules/ src/yastbrowser/ src/yastbrowser/chrome/ src/yastbrowser/components/ s...
by jdsn＠svn.opensuse.org 01 Jul '09

01 Jul '09

Author: jdsn Date: Wed Jul 1 17:57:40 2009 New Revision: 57833 URL: http://svn.opensuse.org/viewcvs/yast?rev=57833&view=rev Log: proper svn ignores Modified: branches/SuSE-SLE-10-SP3-Branch/registration/ (props changed) branches/SuSE-SLE-10-SP3-Branch/registration/agents/ (props changed) branches/SuSE-SLE-10-SP3-Branch/registration/doc/ (props changed) branches/SuSE-SLE-10-SP3-Branch/registration/package/ (props changed) branches/SuSE-SLE-10-SP3-Branch/registration/src/ (props changed) branches/SuSE-SLE-10-SP3-Branch/registration/src/clients/ (props changed) branches/SuSE-SLE-10-SP3-Branch/registration/src/config/ (props changed) branches/SuSE-SLE-10-SP3-Branch/registration/src/modules/ (props changed) branches/SuSE-SLE-10-SP3-Branch/registration/src/yastbrowser/ (props changed) branches/SuSE-SLE-10-SP3-Branch/registration/src/yastbrowser/chrome/ (props changed) branches/SuSE-SLE-10-SP3-Branch/registration/src/yastbrowser/components/ (props changed) branches/SuSE-SLE-10-SP3-Branch/registration/src/yastbrowser/defaults/ (props changed) branches/SuSE-SLE-10-SP3-Branch/registration/src/yastbrowser/defaults/preferences/ (props changed) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r57832 - /trunk/control-center/src/kcategorizedsortfilterproxymodel.cpp
by kmachalkova＠svn.opensuse.org 01 Jul '09

01 Jul '09

Author: kmachalkova Date: Wed Jul 1 17:29:09 2009 New Revision: 57832 URL: http://svn.opensuse.org/viewcvs/yast?rev=57832&view=rev Log: Make sure no groups are visible if no modules match the filter Modified: trunk/control-center/src/kcategorizedsortfilterproxymodel.cpp Modified: trunk/control-center/src/kcategorizedsortfilterproxymodel.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/kcategorizeds… ============================================================================== --- trunk/control-center/src/kcategorizedsortfilterproxymodel.cpp (original) +++ trunk/control-center/src/kcategorizedsortfilterproxymodel.cpp Wed Jul 1 17:29:09 2009 @@ -321,5 +321,10 @@ QString KCategorizedSortFilterProxyModel::matchingGroupFilterRegexp() { QStringList slist = d->filterGroups.toList(); - return slist.join("|"); + + if ( !slist.isEmpty() ) + return slist.join("|"); + else + // dumb constant, make sure nothing matches if the list of matching groups is empty + return QString("zzzz"); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r57831 - /tags/branch-SLE-10-SP3-2_13_23/registration/
by jdsn＠svn.opensuse.org 01 Jul '09

01 Jul '09

Author: jdsn Date: Wed Jul 1 17:09:02 2009 New Revision: 57831 URL: http://svn.opensuse.org/viewcvs/yast?rev=57831&view=rev Log: Created tag branch-SLE-10-SP3-2_13_23 for registration Added: tags/branch-SLE-10-SP3-2_13_23/registration/ - copied from r57830, branches/SuSE-SLE-10-SP3-Branch/registration/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[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...
by jdsn＠svn.opensuse.org 01 Jul '09

01 Jul '09

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/regist… ============================================================================== --- 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/regist… ============================================================================== --- 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(a)suse.de + +- 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(a)suse.de - 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/regist… ============================================================================== --- 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 + " " + _("The following package needs to be installed.") + + " " + sformat("%1", installPackage); // (bnc#444638) + string removeMsg = xenDomU + " " + + sformat(_("To count this installation correctly the package %1 needs to be installed."), installPackage ) + + " " + _("Therefore the following package needs to be removed first.") + + " " + 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/regist… ============================================================================== --- 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/regist… ============================================================================== --- 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/regist… ============================================================================== 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/regist… ============================================================================== 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/regist… ============================================================================== 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/regist… ============================================================================== --- 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(a)suse.de> + * Wolfgang Rosenauer <wr(a)rosenauer.org> * * 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/regist… ============================================================================== --- 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(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0