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

[yast-commit] r57829 - /tags/branch-SLE-10-SP2-2_13_155_2/bootloader/
by juhliarik＠svn.opensuse.org 01 Jul '09

01 Jul '09

Author: juhliarik Date: Wed Jul 1 16:41:29 2009 New Revision: 57829 URL: http://svn.opensuse.org/viewcvs/yast?rev=57829&view=rev Log: Created tag branch-SLE-10-SP2-2_13_155_2 for bootloader Added: tags/branch-SLE-10-SP2-2_13_155_2/bootloader/ - copied from r57828, branches/SuSE-SLE-10-SP2-Branch/bootloader/ -- 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] r57828 - /tags/branch-SLE-10-SP2-2_13_155_2/
by juhliarik＠svn.opensuse.org 01 Jul '09

01 Jul '09

Author: juhliarik Date: Wed Jul 1 16:41:27 2009 New Revision: 57828 URL: http://svn.opensuse.org/viewcvs/yast?rev=57828&view=rev Log: Created tag branch-SLE-10-SP2-2_13_155_2 Added: tags/branch-SLE-10-SP2-2_13_155_2/ -- 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] r57827 - in /branches/SuSE-SLE-10-SP2-Branch/bootloader: ./ package/ src/clients/ src/modules/ src/routines/
by juhliarik＠svn.opensuse.org 01 Jul '09

01 Jul '09

Author: juhliarik Date: Wed Jul 1 16:41:08 2009 New Revision: 57827 URL: http://svn.opensuse.org/viewcvs/yast?rev=57827&view=rev Log: added fix for "/" on nfs Modified: branches/SuSE-SLE-10-SP2-Branch/bootloader/VERSION branches/SuSE-SLE-10-SP2-Branch/bootloader/package/yast2-bootloader.changes branches/SuSE-SLE-10-SP2-Branch/bootloader/src/clients/bootloader_proposal.ycp branches/SuSE-SLE-10-SP2-Branch/bootloader/src/modules/Bootloader.ycp branches/SuSE-SLE-10-SP2-Branch/bootloader/src/routines/dialogs.ycp branches/SuSE-SLE-10-SP2-Branch/bootloader/src/routines/misc.ycp Modified: branches/SuSE-SLE-10-SP2-Branch/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/bootlo… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/bootloader/VERSION (original) +++ branches/SuSE-SLE-10-SP2-Branch/bootloader/VERSION Wed Jul 1 16:41:08 2009 @@ -1 +1 @@ -2.13.155.1 +2.13.155.2 Modified: branches/SuSE-SLE-10-SP2-Branch/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/bootlo… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/bootloader/package/yast2-bootloader.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/bootloader/package/yast2-bootloader.changes Wed Jul 1 16:41:08 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jul 1 16:29:13 CEST 2009 - juhliarik(a)suse.cz + +- added fix for problem with "/" on NFS (bnc#448950) +- 2.13.155.2 + +------------------------------------------------------------------- Wed Jun 11 16:23:19 CEST 2008 - juhliarik(a)suse.cz - added fix for activating partition for XEN (bnc #380982) - 2.13.155.1 Modified: branches/SuSE-SLE-10-SP2-Branch/bootloader/src/clients/bootloader_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/bootlo… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/bootloader/src/clients/bootloader_proposal.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/bootloader/src/clients/bootloader_proposal.ycp Wed Jul 1 16:41:08 2009 @@ -97,24 +97,21 @@ ret = $[ "raw_proposal" : Bootloader::Summary ()]; -//F#300779 - Install diskless client (NFS-root) -//kokso: additional warning that root partition is nfs type -> bootloader will not be installed - -//B#355332 - Bootloader doesn't work if root partitions is like nfs - - map dev = Storage::GetDiskPartition(BootCommon::BootPartitionDevice); - - if (dev["disk"]:"" == "/dev/nfs") + // bnc #448950 - autoyast: the boot partition is of type NFS, bootloader cannot be installed + // F#300779 - Install diskless client (NFS-root) + // kokso: bootloader will not be installed + string device = BootCommon::getBootDisk(); + if (device == "/dev/nfs") { - + y2milestone("bootlader_proposal::MakeProposal -> Boot partition is nfs type, bootloader will not be installed."); - y2milestone("Type of BootPartitionDevice: %1", dev["disk"]:""); + y2milestone("Type of BootPartitionDevice: %1", device); return ret; } - y2milestone("Type of BootPartitionDevice: %1", dev["disk"]:""); + y2milestone("Type of BootPartitionDevice: %1", device); + // F#300779 - end -//F#300779 - end if (Bootloader::getLoaderType () == "") { y2error ("No bootloader selected"); Modified: branches/SuSE-SLE-10-SP2-Branch/bootloader/src/modules/Bootloader.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/bootlo… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/bootloader/src/modules/Bootloader.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/bootloader/src/modules/Bootloader.ycp Wed Jul 1 16:41:08 2009 @@ -278,22 +278,18 @@ */ global define list<string> Summary () { list<string> ret =[]; + // bnc #448950 - autoyast: the boot partition is of type NFS, bootloader cannot be installed + // F#300779 - Install diskless client (NFS-root) + // kokso: bootloader will not be installed + string device = BootCommon::getBootDisk(); -//F#300779 - Install diskless client (NFS-root) -//kokso: additional warning that root partition is nfs type -> bootloader will not be installed - -//B#355332 - Bootloader doesn't work if root partitions is like nfs - map dev = Storage::GetDiskPartition(BootCommon::BootPartitionDevice); - - if (dev["disk"]:"" == "/dev/nfs") + if (device == "/dev/nfs") { - - ret = add (ret, _("The boot partition is of type NFS. Bootloader cannot be installed.")); - y2milestone("Bootloader::Summary() -> Boot partition is nfs type, bootloader will not be installed."); - return ret; - + y2milestone("Bootloader::Write() -> Boot partition is nfs type, bootloader will not be installed."); + return ret; } -//F#300779 - end + // F#300779 -end + ret = blSummary (); // check if default section was changed or not string main_section = getProposedDefaultSection (); @@ -584,22 +580,19 @@ return ret; } + // bnc #448950 - autoyast: the boot partition is of type NFS, bootloader cannot be installed + // F#300779 - Install diskless client (NFS-root) + // kokso: bootloader will not be installed + string device = BootCommon::getBootDisk(); - // F#300779 - Install diskless client (NFS-root) - // kokso: additional warning that root partition is nfs type -> bootloader will not be installed - - // B#355332 - Bootloader doesn't work if root partitions is like nfs - - map dev = Storage::GetDiskPartition(BootCommon::BootPartitionDevice); - - if (dev["disk"]:"" == "/dev/nfs") + if (device == "/dev/nfs") { y2milestone("Bootloader::Write() -> Boot partition is nfs type, bootloader will not be installed."); return ret; } + // F#300779 -end - // F#300779 -end // update graphics menu where possible UpdateGfxMenu (); Modified: branches/SuSE-SLE-10-SP2-Branch/bootloader/src/routines/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/bootlo… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/bootloader/src/routines/dialogs.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/bootloader/src/routines/dialogs.ycp Wed Jul 1 16:41:08 2009 @@ -86,21 +86,18 @@ "tab", `Right ("adv_button") ); -//F#300779 - Install diskless client (NFS-root) -//kokso: additional warning that root partition is nfs type -> bootloader will not be installed + // bnc #448950 - autoyast: the boot partition is of type NFS, bootloader cannot be installed + // F#300779 - Install diskless client (NFS-root) + // kokso: additional warning that root partition is nfs type -> bootloader will not be installed + string device = BootCommon::getBootDisk(); -//B#355332 - Bootloader doesn't work if root partitions is like nfs - - - map dev = Storage::GetDiskPartition(BootCommon::BootPartitionDevice); - - if ((dev["disk"]:"" == "/dev/nfs") && (Mode::installation())) + if ((device == "/dev/nfs") && (Mode::installation())) { Popup::Message(_("The boot partition is of type NFS. Bootloader cannot be installed.")); y2milestone("dialogs::MainDialog() -> Boot partition is nfs type, bootloader will not be installed."); return `next; } -//F#300779: end + // F#300779: end list<string> widget_names = ["tab", "adv_button"]; map<string,map<string,any> > widget_descr = (map<string,map<string,any> >) Modified: branches/SuSE-SLE-10-SP2-Branch/bootloader/src/routines/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/bootlo… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/bootloader/src/routines/misc.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/bootloader/src/routines/misc.ycp Wed Jul 1 16:41:08 2009 @@ -1491,7 +1491,52 @@ } } +/** + * Function return boot device it means + * return boot partition or root partition if boot partition deosn't exist + * function return "" if boot partition or root partition is not defined (autoyast) + * @return string name of boot device (partition) + */ +global string getBootPartition() +{ + string boot_device = ""; + if (BootCommon::BootPartitionDevice != "") + boot_device = BootCommon::BootPartitionDevice; + else if (BootCommon::RootPartitionDevice != "") + boot_device = BootCommon::RootPartitionDevice; + + return boot_device; +} + +/** FATE #303548 - Grub: limit device.map to devices detected by BIOS Int 13 + * Function select boot device - disk + * + * @return string name of boot device - disk + */ + +global string getBootDisk() +{ + string boot_device = getBootPartition(); + + if (boot_device == "") + { + y2milestone("BootPartitionDevice and RootPartitionDevice are empty"); + return boot_device; + } + map p_dev = Storage::GetDiskPartition (boot_device); + + string boot_disk_device = p_dev["disk"]:""; + + if ((boot_disk_device != "") && (boot_disk_device != nil)) + { + y2milestone("Boot device - disk: %1", boot_disk_device); + return boot_disk_device; + } + + y2milestone("Finding boot disk failed!"); + return ""; +} } //end of include -- 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] r57826 - in /branches/tmp/mvidner/core-dbus-values: dbus/SCR_service/ dbus/namespace_service/src/ dbus/namespace_service/testsuite/ libscr/src/ liby2dbus/src/
by mvidner＠svn.opensuse.org 01 Jul '09

01 Jul '09

Author: mvidner Date: Wed Jul 1 16:37:56 2009 New Revision: 57826 URL: http://svn.opensuse.org/viewcvs/yast?rev=57826&view=rev Log: Enhanced DBus -> YCP value conversion by considering also the expected YCP type. Otherwise it is impossible to tell whether an empty array should become an empty map or an empty list (bnc#516492). Not finished yet: - many test cases are missing - errors are only logged but not sent over DBus Modified: branches/tmp/mvidner/core-dbus-values/dbus/SCR_service/DBusServer.cc branches/tmp/mvidner/core-dbus-values/dbus/namespace_service/src/DBusModulesServer.cc branches/tmp/mvidner/core-dbus-values/dbus/namespace_service/src/DBusModulesServer.h branches/tmp/mvidner/core-dbus-values/dbus/namespace_service/testsuite/t2 branches/tmp/mvidner/core-dbus-values/dbus/namespace_service/testsuite/test_all branches/tmp/mvidner/core-dbus-values/libscr/src/SCR.cc branches/tmp/mvidner/core-dbus-values/liby2dbus/src/DBusMsg.cc branches/tmp/mvidner/core-dbus-values/liby2dbus/src/DBusMsg.h branches/tmp/mvidner/core-dbus-values/liby2dbus/src/DBusServerBase.h Modified: branches/tmp/mvidner/core-dbus-values/dbus/SCR_service/DBusServer.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/core-dbus-values/… ============================================================================== --- branches/tmp/mvidner/core-dbus-values/dbus/SCR_service/DBusServer.cc (original) +++ branches/tmp/mvidner/core-dbus-values/dbus/SCR_service/DBusServer.cc Wed Jul 1 16:37:56 2009 @@ -118,7 +118,7 @@ } else { - arg0 = request.getYCPValue(0); + arg0 = request.getYCPValue(0, Type::Path); if (arg0.isNull() || !arg0->isPath()) { @@ -141,8 +141,8 @@ if (check_ok) { - YCPValue arg = request.getYCPValue(1); - YCPValue opt = request.getYCPValue(2); + YCPValue arg = request.getYCPValue(1, Type::Unspec); + YCPValue opt = request.getYCPValue(2, Type::Unspec); std::string caller(request.sender()); @@ -205,9 +205,9 @@ ret.push_back(action_id); - YCPValue path = msg.getYCPValue(0); - YCPValue arg = msg.getYCPValue(1); - YCPValue opt = msg.getYCPValue(2); + YCPValue path = msg.getYCPValue(0, Type::Path); + YCPValue arg = msg.getYCPValue(1, Type::Unspec); + YCPValue opt = msg.getYCPValue(2, Type::Unspec); std::string path_str, arg_str, opt_str; Modified: branches/tmp/mvidner/core-dbus-values/dbus/namespace_service/src/DBusModulesServer.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/core-dbus-values/… ============================================================================== --- branches/tmp/mvidner/core-dbus-values/dbus/namespace_service/src/DBusModulesServer.cc (original) +++ branches/tmp/mvidner/core-dbus-values/dbus/namespace_service/src/DBusModulesServer.cc Wed Jul 1 16:37:56 2009 @@ -433,7 +433,8 @@ while(index < reqarg) { - YCPValue arg = request.getYCPValue(index); + constTypePtr argtype(fptr->parameterType(index)); + YCPValue arg = request.getYCPValue(index, argtype); if (arg.isNull()) { @@ -443,8 +444,6 @@ } // check the data type compatibility - constTypePtr argtype(fptr->parameterType(index)); - if (argtype->matchvalue(arg) < 0) { if (interface == YAST_DBUS_RAW_INTERFACE) @@ -490,6 +489,7 @@ } else { + // FIXME should be a dbus error y2error("Wrong parameters to function %s::%s", object.c_str(), method.c_str()); } } @@ -504,13 +504,14 @@ if (!found) { +// see also DBusServerBase::unknownRequest y2internal("Function %s::%s was not found although it was registered", object.c_str(), method.c_str()); string msg = "Method '"+ interface + "." + method + "' " "on object '" + object + "' doesn't exist"; // anyway, why didnt dbus itself cry? reply.createError(request, // in reply to msg, - "org.freedesktop.DBus.Error.UnknownMethod"); + DBUS_ERROR_UNKNOWN_METHOD); return reply; } @@ -564,7 +565,7 @@ { if (request.arguments() == 1) { - YCPValue arg = request.getYCPValue(0); + YCPValue arg = request.getYCPValue(0, Type::String); if (arg.isNull()) { Modified: branches/tmp/mvidner/core-dbus-values/dbus/namespace_service/src/DBusModulesServer.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/core-dbus-values/… ============================================================================== --- branches/tmp/mvidner/core-dbus-values/dbus/namespace_service/src/DBusModulesServer.h (original) +++ branches/tmp/mvidner/core-dbus-values/dbus/namespace_service/src/DBusModulesServer.h Wed Jul 1 16:37:56 2009 @@ -35,6 +35,7 @@ virtual actionList createActionId(const DBusMsg &msg); // handle unknown requests + // Tries to autoimport and retry virtual DBusMsg unknownRequest(const DBusMsg &request); private: Modified: branches/tmp/mvidner/core-dbus-values/dbus/namespace_service/testsuite/t2 URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/core-dbus-values/… ============================================================================== --- branches/tmp/mvidner/core-dbus-values/dbus/namespace_service/testsuite/t2 (original) +++ branches/tmp/mvidner/core-dbus-values/dbus/namespace_service/testsuite/t2 Wed Jul 1 16:37:56 2009 @@ -8,7 +8,7 @@ YT = dbus.Interface(T_o, 'org.opensuse.YaST.YCPValues') yp = (False, "map", dbus.Dictionary(signature="sv", variant_level=1)) yrp = YT.ParamMap(yp) -print yrp +print "Explicit returned:", yrp assert yrp[0] == False assert yrp[1] == "map" rp = yrp[2] @@ -20,8 +20,6 @@ # p = {} # ValueError: Unable to guess signature from an empty dict p = dbus.Dictionary(signature="sv") rp = T.ParamMap(p) -print rp +print "Implicit returned:", rp assert isinstance(rp, dict) assert len(rp.values()) == 0 - -# T.NoSuchMethod() # TODO it does not throw! Modified: branches/tmp/mvidner/core-dbus-values/dbus/namespace_service/testsuite/test_all URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/core-dbus-values/… ============================================================================== --- branches/tmp/mvidner/core-dbus-values/dbus/namespace_service/testsuite/test_all (original) +++ branches/tmp/mvidner/core-dbus-values/dbus/namespace_service/testsuite/test_all Wed Jul 1 16:37:56 2009 @@ -1,14 +1,21 @@ #! /bin/sh # run all applicable test cases with proper setup -# $0 +# $0 [-a: all, even failing] # $0 ./a_single_testcase -: ${CASES:=$@} -# : ${CASES:=./t?} # t2 fails. also, it requires python - : ${CASES:=./t1} - +if [ "$1" = "" ]; then + # some(most) of them require python + #: ${CASES:=./t1} + : ${CASES:=./t[1235]*} +elif [ "$1" = "-a" ]; then + : ${CASES:=./t? ./t*-*} +else + : ${CASES:=$@} +fi +CASES_A=($CASES) # make array +CASES_A=(${CASES_A[@]/*~/}) # exclude backup files # load the modules from the current directory export Y2DIR=. ./test_server \ ../src/yast_modules_dbus_server --disable-timer --test TEST \ -- \ - $CASES + ${CASES_A[@]} Modified: branches/tmp/mvidner/core-dbus-values/libscr/src/SCR.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/core-dbus-values/… ============================================================================== --- branches/tmp/mvidner/core-dbus-values/libscr/src/SCR.cc (original) +++ branches/tmp/mvidner/core-dbus-values/libscr/src/SCR.cc Wed Jul 1 16:37:56 2009 @@ -83,7 +83,7 @@ y2debug("Received reply type: %d", reply.type()); // return the first argument from the reply - YCPValue ret = reply.getYCPValue(0); + YCPValue ret = reply.getYCPValue(0, Type::Unspec); // validate the reply (check for exceptions) if (reply.type() != DBUS_MESSAGE_TYPE_METHOD_RETURN) Modified: branches/tmp/mvidner/core-dbus-values/liby2dbus/src/DBusMsg.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/core-dbus-values/… ============================================================================== --- branches/tmp/mvidner/core-dbus-values/liby2dbus/src/DBusMsg.cc (original) +++ branches/tmp/mvidner/core-dbus-values/liby2dbus/src/DBusMsg.cc Wed Jul 1 16:37:56 2009 @@ -1,4 +1,3 @@ - /* DBusMsg @@ -662,265 +661,356 @@ } -YCPValue DBusMsg::getYCPValueRaw(DBusMessageIter *it, const std::string &ycp_type) const +// returns NULL if "it" does not point to a string +const char * DBusMsg::getString(DBusMessageIter *it) const { - YCPValue ret; + const char *s = NULL; + if (dbus_message_iter_get_arg_type (it) == DBUS_TYPE_STRING) + { + dbus_message_iter_get_basic(it, &s); + } + return s; +} - int type = dbus_message_iter_get_arg_type(it); +// "it" is the inside iterator +YCPList DBusMsg::getYCPValueList(DBusMessageIter *it, constTypePtr valuetype) const +{ + YCPList lst; - // TODO support more types - if (type == DBUS_TYPE_BOOLEAN) + while (dbus_message_iter_get_arg_type (it) != DBUS_TYPE_INVALID) { - bool b; - dbus_message_iter_get_basic(it, &b); - ret = YCPBoolean(b); + // FIXME this can fail + YCPValue list_val = getYCPValue(it, valuetype); + lst->add(list_val); + + dbus_message_iter_next(it); } - else if (type == DBUS_TYPE_STRING) - { - const char *s; - dbus_message_iter_get_basic(it, &s); + return lst; +} - static const char* block_prefix = "block "; - static const int block_prefix_len = ::strlen(block_prefix); +// "it" is the inside iterator +YCPMap DBusMsg::getYCPValueMap(DBusMessageIter *it, constTypePtr keytype, constTypePtr valuetype) const +{ + YCPMap map; - // use ycp_type to return the correct type - if (ycp_type.empty() || ycp_type == "string") - ret = YCPString(s); - else if (ycp_type == "symbol") - ret = YCPSymbol(s); - else if (ycp_type == "path") - ret = YCPPath(s); - else if (std::string(ycp_type, 0, block_prefix_len) == block_prefix) + while (dbus_message_iter_get_arg_type (it) != DBUS_TYPE_INVALID) + { + // is it a map or a list? + if (dbus_message_iter_get_arg_type(it) == DBUS_TYPE_DICT_ENTRY) { - y2debug("Found YCP block"); + DBusMessageIter mapit; + dbus_message_iter_recurse(it, &mapit); - if (s == NULL || *s == '\0') - { - y2warning("The code block is empty"); - ret = YCPVoid(); - } - else - { - // parse the string, recreate the YCPBlock again - Parser parser(s); - parser.setBuffered(); - YCodePtr p = parser.parse(); - YCPValue contents = YCPNull (); - - if (!p) - { - y2error("Parse error in YCP code: %s", s); - } - else - { - if (p->isBlock ()) - { - contents = YCPCode (p); - } - else - { - contents = p->evaluate (true); - } - } + // DICT keys cannot be structs, skip Bsv + YCPValue key = getYCPValueRawType(&mapit, keytype); - ret = !contents.isNull() ? contents : YCPVoid(); - } + dbus_message_iter_next(&mapit); + + // read the value + YCPValue val = getYCPValue(&mapit, valuetype); + + map->add(key, val); } - else + // else FIXME how to signal error + + dbus_message_iter_next(it); + } + return map; +} + +// returns YCPNull without an error if "it" does not point to an integer/byte +YCPValue DBusMsg::getYCPValueInteger(DBusMessageIter *it) const +{ + int type = dbus_message_iter_get_arg_type(it); + YCPValue ret; + + switch (type) { + case DBUS_TYPE_INT64: { - y2warning("Unknown STRING data, returning as YCPString"); - // default is YCPString - ret = YCPString(s); + dbus_int64_t i; + dbus_message_iter_get_basic(it, &i); + ret = YCPInteger(i); + break; + } + case DBUS_TYPE_UINT64: + { + // warning: YCPInteger is signed! + dbus_uint64_t i; + dbus_message_iter_get_basic(it, &i); + ret = YCPInteger(i); + break; + } + case DBUS_TYPE_INT32: + { + dbus_int32_t i; + dbus_message_iter_get_basic(it, &i); + ret = YCPInteger(i); + break; + } + case DBUS_TYPE_UINT32: + { + dbus_uint32_t i; + dbus_message_iter_get_basic(it, &i); + ret = YCPInteger(i); + break; + } + case DBUS_TYPE_INT16: + { + dbus_int16_t i; + dbus_message_iter_get_basic(it, &i); + ret = YCPInteger(i); + break; + } + case DBUS_TYPE_UINT16: + { + dbus_uint16_t i; + dbus_message_iter_get_basic(it, &i); + ret = YCPInteger(i); + break; + } + case DBUS_TYPE_BYTE: + { + unsigned char i; + dbus_message_iter_get_basic(it, &i); + ret = YCPInteger(i); + break; } } - else if (type == DBUS_TYPE_ARRAY) - { - DBusMessageIter sub; - dbus_message_iter_recurse(it, &sub); + return ret; +} - // DBUS_TYPE_ARRAY is used for YCPList and YCPMap - if (ycp_type == "list") - { - y2debug("Found an YCPList container"); - YCPList lst; +// here ycptype is NOT Type::Unspec +YCPValue DBusMsg::getYCPValueRawType(DBusMessageIter *it, constTypePtr ycptype) const +{ + if (ycptype->isAny()) + return getYCPValueRawAny(it); - while (dbus_message_iter_get_arg_type (&sub) != DBUS_TYPE_INVALID) - { - YCPValue list_val = getYCPValue(&sub); - lst->add(list_val); + YCPValue ret; - dbus_message_iter_next(&sub); - } + int type = dbus_message_iter_get_arg_type(it); + bool mismatch = true; - ret = lst; + if (ycptype->isBoolean()) + { + if (type == DBUS_TYPE_BOOLEAN) + { + bool b; + dbus_message_iter_get_basic(it, &b); + ret = YCPBoolean(b); + mismatch = false; } - else if (ycp_type == "map") + } + else if (ycptype->isInteger()) + { + ret = getYCPValueInteger(it); + mismatch = ret.isNull(); + } + else if (ycptype->isFloat()) + { + if (type == DBUS_TYPE_DOUBLE) { - y2debug("Found an YCPMap container"); - YCPMap map; - - while (dbus_message_iter_get_arg_type (&sub) != DBUS_TYPE_INVALID) - { - // is it a map or a list? - if (dbus_message_iter_get_arg_type(&sub) == DBUS_TYPE_DICT_ENTRY) - { - DBusMessageIter mapit; - dbus_message_iter_recurse(&sub, &mapit); - - // read the key without the header - YCPValue key = getYCPValueRaw(&mapit); + double d; + dbus_message_iter_get_basic(it, &d); + ret = YCPFloat(d); + mismatch = false; + } + } + else if (ycptype->isList()) + { + // DBUS_TYPE_ARRAY is used for YCPList and YCPMap + // TODO sending a dict where a list is expected will confusingly complain about value type mismatch + if (type == DBUS_TYPE_ARRAY) + { + DBusMessageIter sub; + dbus_message_iter_recurse(it, &sub); - dbus_message_iter_next(&mapit); + constListTypePtr list_type = (constListTypePtr) ycptype; + constTypePtr valuetype = list_type->type(); - // read the value - YCPValue val = getYCPValue(&mapit); + // FIXME this can fail + ret = getYCPValueList(&sub, valuetype); + mismatch = false; + } + } + else if (ycptype->isMap()) + { + if (type == DBUS_TYPE_ARRAY) + { + DBusMessageIter sub; + dbus_message_iter_recurse(it, &sub); - map->add(key, val); - } + constMapTypePtr map_type = (constMapTypePtr) ycptype; + constTypePtr keytype = map_type->keytype(); + constTypePtr valuetype = map_type->valuetype(); - dbus_message_iter_next(&sub); - } - - ret = map; + ret = getYCPValueMap(&sub, keytype, valuetype); + mismatch = false; } - else if (ycp_type == "term") + } + else if (ycptype->isTerm()) + { + // array with first item being the name + if (type == DBUS_TYPE_ARRAY) { - y2debug("Found an YCPTerm container"); + DBusMessageIter sub; + dbus_message_iter_recurse(it, &sub); - YCPList term_list; std::string term_name; + YCPList term_list; - int index = 0; - while (dbus_message_iter_get_arg_type (&sub) != DBUS_TYPE_INVALID) + if (dbus_message_iter_get_arg_type (&sub) != DBUS_TYPE_INVALID) { - YCPValue list_val = getYCPValue(&sub); - - if (index == 0) + YCPValue ytn = getYCPValue(&sub, Type::String); + if (!ytn.isNull() && ytn->isString()) { - if (!list_val.isNull() && list_val->isString()) - { - term_name = list_val->asString()->value(); - } - else - { - y2error("Expecting string (term name) in the list"); - return YCPVoid(); - } + term_name = ytn->asString()->value(); + dbus_message_iter_next(&sub); + + term_list = getYCPValueList(&sub, Type::Unspec); + + y2debug("Received TERM: name: %s, list: %s", term_name.c_str(), term_list->toString().c_str()); + + ret = YCPTerm(term_name, term_list); + mismatch = false; } else { - term_list->add(list_val); + y2error("Expecting string (term name) in the list"); + return YCPVoid(); // FIXME } - - dbus_message_iter_next(&sub); - index++; } - - y2debug("Received TERM: name: %s, list: %s", term_name.c_str(), term_list->toString().c_str()); - - YCPTerm term(term_name, term_list); - ret = term; } - else if (ycp_type.empty()) + } + else if (ycptype->isString()) + { + const char *s = getString(it); + if (s != NULL) { - y2debug("Reading RAW DBus array"); - - // is the container a map or a list? - if (dbus_message_iter_get_arg_type(&sub) == DBUS_TYPE_DICT_ENTRY) + ret = YCPString(s); + mismatch = false; + } + } + else if (ycptype->isSymbol()) + { + const char *s = getString(it); + if (s != NULL) + { + ret = YCPSymbol(s); + mismatch = false; + } + } + else if (ycptype->isPath()) + { + const char *s = getString(it); + if (s != NULL) + { + ret = YCPPath(s); + mismatch = false; + } + } + // parsed YCP code, wow. + //FIXME does the execution precede auth checks?! + else if (ycptype->isBlock()) + { + const char *s = getString(it); + if (s != NULL) + { + if (*s == '\0') { - y2debug("Found a map"); - - YCPMap map; - - while (dbus_message_iter_get_arg_type (&sub) != DBUS_TYPE_INVALID) - { - // is it a map or a list? - if (dbus_message_iter_get_arg_type(&sub) == DBUS_TYPE_DICT_ENTRY) - { - DBusMessageIter mapit; - dbus_message_iter_recurse(&sub, &mapit); - - // read the key without the header - YCPValue key = getYCPValueRaw(&mapit); - - dbus_message_iter_next(&mapit); - - // read the value - YCPValue val = getYCPValueRaw(&mapit); - - map->add(key, val); - } - - dbus_message_iter_next(&sub); - } - - ret = map; + y2warning("The code block is empty"); + ret = YCPVoid(); } else { - y2debug("Found a list"); - - YCPList lst; + // parse the string, recreate the YCPBlock again + Parser parser(s); + parser.setBuffered(); + YCodePtr p = parser.parse(); - while (dbus_message_iter_get_arg_type (&sub) != DBUS_TYPE_INVALID) + if (!p) { - YCPValue list_val = getYCPValue(&sub); - lst->add(list_val); - - dbus_message_iter_next(&sub); + y2error("Parse error in YCP code: %s", s); + ret = YCPVoid(); + } + else + { + ret = p->isBlock ()? YCPCode (p): p->evaluate (true); } - - ret = lst; } - } - else - { - y2error("Unknown container type for DBUS_TYPE_ARRAY: %s", ycp_type.c_str()); - ret = YCPVoid(); + mismatch = false; } } - else if (type == DBUS_TYPE_DOUBLE) - { - double d; - dbus_message_iter_get_basic(it, &d); - ret = YCPFloat(d); - } - else if (type == DBUS_TYPE_INT64) + else { - dbus_int64_t i; - dbus_message_iter_get_basic(it, &i); - ret = YCPInteger(i); + y2error ("Missing code to convert DBus data to YCP type %s", + ycptype->toString().c_str()); } - else if (type == DBUS_TYPE_UINT64) + + if (mismatch) { - // warning: YCPInteger is signed! - dbus_uint64_t i; - dbus_message_iter_get_basic(it, &i); - ret = YCPInteger(i); + y2error ("Data mismatch, expecting YCP type %s, got DBus type %c", + ycptype->toString().c_str(), (char)type); } - else if (type == DBUS_TYPE_INT32) + + return ret; +} + +YCPValue DBusMsg::getYCPValueRawAny(DBusMessageIter *it) const +{ + YCPValue ret; + + int type = dbus_message_iter_get_arg_type(it); + // TODO support more types + if (type == DBUS_TYPE_BOOLEAN) { - dbus_int32_t i; - dbus_message_iter_get_basic(it, &i); - ret = YCPInteger(i); + bool b; + dbus_message_iter_get_basic(it, &b); + ret = YCPBoolean(b); } - else if (type == DBUS_TYPE_UINT32) + else if (type == DBUS_TYPE_STRING) { - dbus_uint32_t i; - dbus_message_iter_get_basic(it, &i); - ret = YCPInteger(i); + const char *s; + dbus_message_iter_get_basic(it, &s); + ret = YCPString(s); + } - else if (type == DBUS_TYPE_INT16) + else if (type == DBUS_TYPE_ARRAY) { - dbus_int16_t i; - dbus_message_iter_get_basic(it, &i); - ret = YCPInteger(i); + DBusMessageIter sub; + dbus_message_iter_recurse(it, &sub); + + // DBUS_TYPE_ARRAY is used for YCPList and YCPMap + y2debug("Reading RAW DBus array"); + + // is the container a map or a list? + // An empty map is indistinguishable from a list! + if (dbus_message_iter_get_arg_type(&sub) == DBUS_TYPE_DICT_ENTRY) + { + y2debug("Found a map"); + ret = getYCPValueMap(&sub, Type::Any, Type::Unspec); + } + else + { + y2debug("Found a list"); + + YCPList lst; + + while (dbus_message_iter_get_arg_type (&sub) != DBUS_TYPE_INVALID) + { + YCPValue list_val = getYCPValue(&sub, Type::Unspec); + lst->add(list_val); + + dbus_message_iter_next(&sub); + } + + ret = lst; + } } - else if (type == DBUS_TYPE_UINT16) + else if (type == DBUS_TYPE_DOUBLE) { - dbus_uint16_t i; - dbus_message_iter_get_basic(it, &i); - ret = YCPInteger(i); + double d; + dbus_message_iter_get_basic(it, &d); + ret = YCPFloat(d); } else if (type == DBUS_TYPE_VARIANT) { @@ -933,42 +1023,57 @@ // there should be just one value inside the container if (dbus_message_iter_get_arg_type (&sub) != DBUS_TYPE_INVALID) { - val = getYCPValueRaw(&sub); + val = getYCPValueRawAny(&sub); } - + // FIXME YCPNull possible ret = val; } else { - y2error("Unsupported DBus type: %d (%c)", type, (char)type); - ret = YCPVoid(); + ret = getYCPValueInteger(it); + if (ret.isNull()) + { + y2error("Unsupported DBus type: %d (%c)", type, (char)type); + ret = YCPVoid(); + } } return ret; } -YCPValue DBusMsg::getYCPValue(DBusMessageIter *it) const +// main getter dispatcher +YCPValue DBusMsg::getYCPValue(DBusMessageIter *it, constTypePtr ycptype) const { int type = dbus_message_iter_get_arg_type(it); y2debug("Found DBus type: %d (%c)", type, (char)type); + YCPValue ret; if (type != DBUS_TYPE_STRUCT) { - YCPValue ret = getYCPValueRaw(it, ""); - if (ret.isNull()) - { - ret = YCPVoid(); - } + if (ycptype->isUnspec()) + ret = getYCPValueRawAny(it); + else + ret = getYCPValueRawType(it, ycptype); - y2milestone("Using RAW dbus value '%s' instead of (bsv) YCPValue structure", ret->toString().c_str()); +// y2milestone("Using RAW dbus value '%s' instead of (bsv) YCPValue structure", ret->toString().c_str()); + } + else + ret = getYCPValueBsv(it, ycptype); - return ret; + if (ret.isNull()) // TODO unify + { + ret = YCPVoid(); } + return ret; +} +// "it" must point to a struct +YCPValue DBusMsg::getYCPValueBsv(DBusMessageIter *it, constTypePtr ycptype) const +{ DBusMessageIter struct_iter; dbus_message_iter_recurse(it, &struct_iter); - type = dbus_message_iter_get_arg_type(&struct_iter); + int type = dbus_message_iter_get_arg_type(&struct_iter); bool received_nil = false; // read the nil flag at the beginning @@ -987,6 +1092,8 @@ } else { + // FIXME "response" is wrong, can go both ways. + // for params, should throw param dbus error y2error("Missing nil flag in the response"); return YCPVoid(); } @@ -994,14 +1101,29 @@ // read the data type in the header dbus_message_iter_next(&struct_iter); - std::string ycp_type; + constTypePtr vycptype = Type::Unspec; type = dbus_message_iter_get_arg_type(&struct_iter); if (type == DBUS_TYPE_STRING) { const char *str; dbus_message_iter_get_basic(&struct_iter, &str); y2debug("HEADER: type: %s", str); - ycp_type = str; + + std::string ycp_type = str; + if (ycp_type == "string") + vycptype = Type::String; + else if (ycp_type == "symbol") + vycptype = Type::Symbol; + else if (ycp_type == "path") + vycptype = Type::Path; + else if (ycp_type == "list") + vycptype = Type::List; + else if (ycp_type == "map") + vycptype = Type::Map; + else if (ycp_type == "block") + vycptype = Type::Block; + else + y2error("Dunno how to translate BSV type %s to YCP type", str); } else { @@ -1023,12 +1145,13 @@ DBusMessageIter variant_iter; dbus_message_iter_recurse(&struct_iter, &variant_iter); - YCPValue ret = getYCPValueRaw(&variant_iter, ycp_type); + YCPValue ret = getYCPValueRawType(&variant_iter, vycptype); return (received_nil) ? YCPVoid() : ret; } -YCPValue DBusMsg::getYCPValue(int index) const +// the public getter: idx +YCPValue DBusMsg::getYCPValue(int index, constTypePtr ycptype) const { YCPValue ret = YCPNull(); @@ -1046,6 +1169,7 @@ int i = 0; // iterate over the other arguments +//wasteful API? while (i < index && dbus_message_iter_next(&it)) { i++; @@ -1053,7 +1177,7 @@ if (i == index) { - ret = getYCPValue(&it); + ret = getYCPValue(&it, ycptype); } else { Modified: branches/tmp/mvidner/core-dbus-values/liby2dbus/src/DBusMsg.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/core-dbus-values/… ============================================================================== --- branches/tmp/mvidner/core-dbus-values/liby2dbus/src/DBusMsg.h (original) +++ branches/tmp/mvidner/core-dbus-values/liby2dbus/src/DBusMsg.h Wed Jul 1 16:37:56 2009 @@ -1,4 +1,3 @@ - /* DBusMsg */ @@ -12,6 +11,8 @@ #include <ycp/TypePtr.h> class YCPValue; +class YCPList; +class YCPMap; // DBusMessage wrapper class DBusMsg @@ -47,7 +48,8 @@ bool addYCPValue(const YCPValue &val); bool addValueAs(const YCPValue &val, constTypePtr rettype = NULL); - YCPValue getYCPValue(int index) const; + // ycptype may be Type::Any + YCPValue getYCPValue(int index, constTypePtr ycptype) const; bool isMethodCall(const std::string &interface, const std::string &method) const; int arguments() const; @@ -78,8 +80,27 @@ int typeInt(const YCPValue &val) const; std::string typeStr(const YCPValue &val, bool bsv_enc = true) const; - YCPValue getYCPValue(DBusMessageIter *it) const; - YCPValue getYCPValueRaw(DBusMessageIter *it, const std::string &ycp_type = std::string()) const; + YCPValue getYCPValue(DBusMessageIter *it, constTypePtr ycptype) const; + YCPValue getYCPValueRawType(DBusMessageIter *it, constTypePtr ycptype) const; + YCPValue getYCPValueRawAny(DBusMessageIter *it) const; + YCPValue getYCPValueBsv(DBusMessageIter *it, constTypePtr ycptype) const; + + const char * getString(DBusMessageIter *it) const; + YCPList getYCPValueList(DBusMessageIter *it, constTypePtr valuetype) const; + YCPMap getYCPValueMap(DBusMessageIter *it, constTypePtr keytype, constTypePtr valuetype) const; + YCPValue getYCPValueInteger(DBusMessageIter *it) const; + +}; + +class DBusException +{ + std::string m_name; + std::string m_message; +public: + DBusException(const std::string& name, const std::string& message) + :m_name(name), m_message(message) {} + std::string name() const { return m_name; } + std::string message() const { return m_message; } }; class SignatureException : std::exception @@ -89,4 +110,3 @@ }; #endif - Modified: branches/tmp/mvidner/core-dbus-values/liby2dbus/src/DBusServerBase.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/core-dbus-values/… ============================================================================== --- branches/tmp/mvidner/core-dbus-values/liby2dbus/src/DBusServerBase.h (original) +++ branches/tmp/mvidner/core-dbus-values/liby2dbus/src/DBusServerBase.h Wed Jul 1 16:37:56 2009 @@ -56,6 +56,7 @@ virtual actionList createActionId(const DBusMsg &msg); // handle unknown requests + // Some servers will try to autoload and retry virtual DBusMsg unknownRequest(const DBusMsg &request); std::string service_name; -- 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] r57825 - /tags/branch-Code-11-2_17_25/registration/
by jdsn＠svn.opensuse.org 01 Jul '09

01 Jul '09

Author: jdsn Date: Wed Jul 1 16:02:08 2009 New Revision: 57825 URL: http://svn.opensuse.org/viewcvs/yast?rev=57825&view=rev Log: Created tag branch-Code-11-2_17_25 for registration Added: tags/branch-Code-11-2_17_25/registration/ - copied from r57824, branches/SuSE-Code-11-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] r57824 - /tags/branch-Code-11-2_17_25/
by jdsn＠svn.opensuse.org 01 Jul '09

01 Jul '09

Author: jdsn Date: Wed Jul 1 16:02:07 2009 New Revision: 57824 URL: http://svn.opensuse.org/viewcvs/yast?rev=57824&view=rev Log: Created tag branch-Code-11-2_17_25 Added: tags/branch-Code-11-2_17_25/ -- 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] rest-service : branch, master, updated.
by git version control 01 Jul '09

01 Jul '09

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "YaST web service". The branch, master has been updated via 181f33f2bc29427a718090af373dd7bd93ff5d2f (commit) from 168a9b41e7fa79ddfc5f925452050f9c5be7e2e1 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 181f33f2bc29427a718090af373dd7bd93ff5d2f Author: Bjoern Geuken <bgeuken(a)suse.de> Date: Wed Jul 1 15:50:58 2009 +0200 security module: fixed wrong naming in package dir ----------------------------------------------------------------------- Summary of changes and diff: .../org.opensuse.yast.system.security.policy | 2 +- .../package/yast2-webservice-security.spec | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/securities/package/org.opensuse.yast.system.security.policy b/plugins/securities/package/org.opensuse.yast.system.security.policy index b3fe12a..de34769 100644 --- a/plugins/securities/package/org.opensuse.yast.system.security.policy +++ b/plugins/securities/package/org.opensuse.yast.system.security.policy @@ -8,7 +8,7 @@ <vendor_url>http://en.opensuse.org/YAST</vendor_url>  <action id="org.opensuse.yast.system.security.read"> diff --git a/plugins/securities/package/yast2-webservice-security.spec b/plugins/securities/package/yast2-webservice-security.spec index db848b0..d994246 100644 --- a/plugins/securities/package/yast2-webservice-security.spec +++ b/plugins/securities/package/yast2-webservice-security.spec @@ -25,7 +25,7 @@ BuildArch: noarch # %define pkg_user yastws -%define plugin_name language +%define plugin_name security # @@ -58,11 +58,11 @@ rm -rf $RPM_BUILD_ROOT %post # -# granting all permissions for root +# granting all permissions for root # /etc/yastws/tools/policyKit-rights.rb --user root --action grant >& /dev/null || : -%files +%files %defattr(-,root,root) %dir /srv/www/%{pkg_user} %dir /srv/www/%{pkg_user}/vendor hooks/post-receive -- YaST web service -- 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] r57823 - /branches/tmp/mvidner/core-dbus-values/
by mvidner＠svn.opensuse.org 01 Jul '09

01 Jul '09

Author: mvidner Date: Wed Jul 1 15:32:49 2009 New Revision: 57823 URL: http://svn.opensuse.org/viewcvs/yast?rev=57823&view=rev Log: Temporary branch to stabilize the refactoring of DBus to YCP value conversions, and related error handling, started in bnc#516492. Added: branches/tmp/mvidner/core-dbus-values/ (props changed) - copied from r57822, trunk/core/ -- 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] r57822 - /tags/branch-Code-11-2_17_7/pos-installation/
by jsuchome＠svn.opensuse.org 01 Jul '09

01 Jul '09

Author: jsuchome Date: Wed Jul 1 15:29:19 2009 New Revision: 57822 URL: http://svn.opensuse.org/viewcvs/yast?rev=57822&view=rev Log: Created tag branch-Code-11-2_17_7 for pos-installation Added: tags/branch-Code-11-2_17_7/pos-installation/ - copied from r57821, branches/SuSE-Code-11-Branch/pos-installation/ -- 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] r57821 - in /branches/SuSE-Code-11-Branch/pos-installation: VERSION package/yast2-pos-installation.changes src/clients/inst_slepos_migration.ycp src/clients/inst_slepos_server_selection.ycp
by jsuchome＠svn.opensuse.org 01 Jul '09

01 Jul '09

Author: jsuchome Date: Wed Jul 1 15:29:08 2009 New Revision: 57821 URL: http://svn.opensuse.org/viewcvs/yast?rev=57821&view=rev Log: - always run Solve and Commit, so product metadata get installed (bnc#517288) - adapt the migration progess to real script output (bnc#518185) - 2.17.7 Modified: branches/SuSE-Code-11-Branch/pos-installation/VERSION branches/SuSE-Code-11-Branch/pos-installation/package/yast2-pos-installation.changes branches/SuSE-Code-11-Branch/pos-installation/src/clients/inst_slepos_migration.ycp branches/SuSE-Code-11-Branch/pos-installation/src/clients/inst_slepos_server_selection.ycp Modified: branches/SuSE-Code-11-Branch/pos-installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/pos-insta… ============================================================================== --- branches/SuSE-Code-11-Branch/pos-installation/VERSION (original) +++ branches/SuSE-Code-11-Branch/pos-installation/VERSION Wed Jul 1 15:29:08 2009 @@ -1 +1 @@ -2.17.6 +2.17.7 Modified: branches/SuSE-Code-11-Branch/pos-installation/package/yast2-pos-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/pos-insta… ============================================================================== --- branches/SuSE-Code-11-Branch/pos-installation/package/yast2-pos-installation.changes (original) +++ branches/SuSE-Code-11-Branch/pos-installation/package/yast2-pos-installation.changes Wed Jul 1 15:29:08 2009 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Wed Jul 1 12:08:23 CEST 2009 - jsuchome(a)suse.cz + +- always run Solve and Commit, so product metadata get installed + (bnc#517288) +- adapt the migration progess to real script output (bnc#518185) +- 2.17.7 + +------------------------------------------------------------------- Wed Jul 1 09:45:01 CEST 2009 - jsuchome(a)suse.cz - save the content of input boxes (bnc#518061) Modified: branches/SuSE-Code-11-Branch/pos-installation/src/clients/inst_slepos_migration.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/pos-insta… ============================================================================== --- branches/SuSE-Code-11-Branch/pos-installation/src/clients/inst_slepos_migration.ycp (original) +++ branches/SuSE-Code-11-Branch/pos-installation/src/clients/inst_slepos_migration.ycp Wed Jul 1 15:29:08 2009 @@ -70,7 +70,7 @@ y2internal ("new line: '%1'", line); // read total number of tasks - if (substring (line, 0, 6) == "tasks:") + if (substring (line, 0, 7) == "titles:") { list<string> l = splitstring (line, " "); tasks = tointeger (l[1]:"0"); @@ -82,7 +82,7 @@ ); } // update current task label - else if (substring (line, 0, 5) == "task:") + else if (substring (line, 0, 6) == "title:") { list<string> l = splitstring (line, " "); l = remove (l, 0); @@ -98,7 +98,7 @@ else if (substring (line, 0, 9) == "position:") { list<string> l = splitstring (line, " "); - integer pos = tointeger (l[1]:"0"); + integer pos = tointeger (deletechars (l[1]:"0", "% ")); if (pos == nil) pos = 0; UI::ChangeWidget (`id (`current_progress), `Value, pos); Modified: branches/SuSE-Code-11-Branch/pos-installation/src/clients/inst_slepos_server_selection.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/pos-insta… ============================================================================== --- branches/SuSE-Code-11-Branch/pos-installation/src/clients/inst_slepos_server_selection.ycp (original) +++ branches/SuSE-Code-11-Branch/pos-installation/src/clients/inst_slepos_server_selection.ycp Wed Jul 1 15:29:08 2009 @@ -140,16 +140,13 @@ labels)); return manual_package_selection (); } - if (to_install != []) - { - if (Pkg::PkgSolve (false) == true) { + if (Pkg::PkgSolve (false) == true) { Pkg::PkgCommit (0); - } - else { - // TRANSLATORS: Error message - Report::Error (_("An error occured in pattern selection\nStarting manual selection.")); - return manual_package_selection (); - } + } + else { + // TRANSLATORS: Error message + Report::Error (_("An error occured in pattern selection\nStarting manual selection.")); + return manual_package_selection (); } // update the migrate info for the next dialog -- 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] r57820 - in /trunk/control-center/src: CMakeLists.txt yqmodulegroupsmodel.cpp yqmodulesmodel.cpp
by kmachalkova＠svn.opensuse.org 01 Jul '09

01 Jul '09

Author: kmachalkova Date: Wed Jul 1 15:11:04 2009 New Revision: 57820 URL: http://svn.opensuse.org/viewcvs/yast?rev=57820&view=rev Log: Use defines for icon dirs (theme/current as default, hicolor as fallback) Modified: trunk/control-center/src/CMakeLists.txt trunk/control-center/src/yqmodulegroupsmodel.cpp trunk/control-center/src/yqmodulesmodel.cpp Modified: trunk/control-center/src/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/CMakeLists.tx… ============================================================================== --- trunk/control-center/src/CMakeLists.txt (original) +++ trunk/control-center/src/CMakeLists.txt Wed Jul 1 15:11:04 2009 @@ -7,6 +7,7 @@ ADD_DEFINITIONS(-DQT_NO_DEBUG_OUTPUT) ADD_DEFINITIONS("-DLOCALEDIR=\"${CMAKE_INSTALL_PREFIX}/share/YaST2/locale\"") ADD_DEFINITIONS("-DICON_DIR=\"${THEMEDIR}/current/icons/32x32/apps\"") +ADD_DEFINITIONS("-DFALLBACK_ICON_DIR=\"${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/32x32/apps\"") ADD_DEFINITIONS("-DPIXMAP_DIR=\"${THEMEDIR}/current/icons/32x32/apps\"") ADD_DEFINITIONS("-DDESKTOP_TRANSLATIONS_DIR=\"${CMAKE_INSTALL_PREFIX}/share/locale\"") ADD_DEFINITIONS("-DMODULES_DESKTOP_DIR=\"${CMAKE_INSTALL_PREFIX}/share/applications/YaST2\"") Modified: trunk/control-center/src/yqmodulegroupsmodel.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/yqmodulegroup… ============================================================================== --- trunk/control-center/src/yqmodulegroupsmodel.cpp (original) +++ trunk/control-center/src/yqmodulegroupsmodel.cpp Wed Jul 1 15:11:04 2009 @@ -33,8 +33,8 @@ : YQDesktopFilesModel(parent) { addDesktopFilesPath( GROUPS_DESKTOP_DIR ); - addIconPath("/usr/share/YaST2/theme/current/icons/32x32/apps"); - addIconPath("/usr/share/icons/hicolor/32x32/apps"); + addIconPath( ICON_DIR ); + addIconPath( FALLBACK_ICON_DIR ); reindex(); //addPersonalStuff(); } Modified: trunk/control-center/src/yqmodulesmodel.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/yqmodulesmode… ============================================================================== --- trunk/control-center/src/yqmodulesmodel.cpp (original) +++ trunk/control-center/src/yqmodulesmodel.cpp Wed Jul 1 15:11:04 2009 @@ -50,8 +50,8 @@ , priv(new Private) { addDesktopFilesPath( MODULES_DESKTOP_DIR ); - addIconPath("/usr/share/YaST2/theme/current/icons/32x32/apps"); - addIconPath("/usr/share/icons/hicolor/32x32/apps"); + addIconPath( ICON_DIR ); + addIconPath( FALLBACK_ICON_DIR ); removeEmptyGroups(); } -- 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] r57819 - in /trunk/autoinstallation: doc/CreateProfileDetails.xml package/autoyast2.changes src/dialogs/script_dialogs.ycp src/modules/AutoinstScripts.ycp src/schema/scripts.rnc
by ug＠svn.opensuse.org 01 Jul '09

01 Jul '09

Author: ug Date: Wed Jul 1 13:50:19 2009 New Revision: 57819 URL: http://svn.opensuse.org/viewcvs/yast?rev=57819&view=rev Log: <feedback_type> for scripts invented Modified: trunk/autoinstallation/doc/CreateProfileDetails.xml trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/dialogs/script_dialogs.ycp trunk/autoinstallation/src/modules/AutoinstScripts.ycp trunk/autoinstallation/src/schema/scripts.rnc Modified: trunk/autoinstallation/doc/CreateProfileDetails.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/CreateProfi… ============================================================================== --- trunk/autoinstallation/doc/CreateProfileDetails.xml (original) +++ trunk/autoinstallation/doc/CreateProfileDetails.xml Wed Jul 1 13:50:19 2009 @@ -2174,6 +2174,12 @@ <entry>optional. The default is false. This option was invented with SL 10.1 / SLES10</entry> </row> <row> + <entry>feedback_type</entry> + <entry>this can be "message", "warning", "error" and you can control the timeout of those popups with the <report> section. + <para><screen><feedback_type>warning</feedback_type></screen></para></entry> + <entry>optional. If missing, an always blocking popup is used. This option was invited with openSUSE 11.2 (not SLES11)</entry> + </row> + <row> <entry>debug</entry> <entry>if this is true, every single line of a shell script is logged. Perl scripts are run with warnings turned on. @@ -2250,6 +2256,12 @@ <entry>optional. The default is false. This option was invented with SL 10.1 / SLES10</entry> </row> <row> + <entry>feedback_type</entry> + <entry>this can be "message", "warning", "error" and you can control the timeout of those popups with the <report> section. + <para><screen><feedback_type>warning</feedback_type></screen></para></entry> + <entry>optional. If missing, an always blocking popup is used. This option was invited with openSUSE 11.2 (not SLES11)</entry> + </row> + <row> <entry>debug</entry> <entry>if this is true, every single line of a shell script is logged. Perl scripts are run with warnings turned on. @@ -2335,6 +2347,12 @@ <entry>optional. The default is false. This option was invented with SL 10.1 / SLES10</entry> </row> <row> + <entry>feedback_type</entry> + <entry>this can be "message", "warning", "error" and you can control the timeout of those popups with the <report> section. + <para><screen><feedback_type>warning</feedback_type></screen></para></entry> + <entry>optional. If missing, an always blocking popup is used. This option was invited with openSUSE 11.2 (not SLES11)</entry> + </row> + <row> <entry>debug</entry> <entry>if this is true, every single line of a shell script is logged. Perl scripts are run with warnings turned on. @@ -2421,6 +2439,12 @@ <entry>optional. The default is false. This option was invented with SL 10.1 / SLES10</entry> </row> <row> + <entry>feedback_type</entry> + <entry>this can be "message", "warning", "error" and you can control the timeout of those popups with the <report> section. + <para><screen><feedback_type>warning</feedback_type></screen></para></entry> + <entry>optional. If missing, an always blocking popup is used. This option was invited with openSUSE 11.2 (not SLES11)</entry> + </row> + <row> <entry>debug</entry> <entry>if this is true, every single line of a shell script is logged. Perl scripts are run with warnings turned on. Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyas… ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Wed Jul 1 13:50:19 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Jul 1 11:19:42 CEST 2009 - ug(a)suse.de + +- <feedback_type> for scripts invented + +------------------------------------------------------------------- Tue Jun 30 11:35:23 CEST 2009 - ug(a)suse.de - <filename> option added to the <pxe> section Modified: trunk/autoinstallation/src/dialogs/script_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/dialogs/scr… ============================================================================== --- trunk/autoinstallation/src/dialogs/script_dialogs.ycp (original) +++ trunk/autoinstallation/src/dialogs/script_dialogs.ycp Wed Jul 1 13:50:19 2009 @@ -163,13 +163,23 @@ ), `HBox( // a checkbox where you can choose if you want to see script-feedback output or not - `CheckBox( `id( `feedback ), _("&Feedback"), ( script["feedback"]:false ) ), + `CheckBox( `id( `feedback ), `opt(`notify), _("&Feedback"), ( script["feedback"]:false ) ), // a checkbox where you can choose if you want to see script-debug output or not `CheckBox( `id( `debug ), _("&Debug"), ( script["debug"]:true ) ), `CheckBox( `id( `chrooted ), _("&Chrooted"), ( script["chrooted"]:false ) ), // a checkbox where you can choose if you need to have network when the script is running `CheckBox( `id( `network ), _("&Network"), ( script["network_needed"]:false ) ) ), + `HBox( + // a checkbox where you can choose if you want to see script-feedback output or not + `ComboBox( `id( `feedback_type ), _("&Feedback Type"), + [ `item(`id(""), _("none"), (script["feedback_type"]:"" == "")), + `item(`id("message"), _("Message"), (script["feedback_type"]:"" == "message")), + `item(`id("warning"), _("Warning"), (script["feedback_type"]:"" == "warning")), + `item(`id("error") , _("Error"), (script["feedback_type"]:"" == "error")) + ] + ) + ), `VSpacing(1), `HBox( `MultiLineEdit(`id(`source), _("S&cript Source"), script["source"]:"") @@ -202,6 +212,9 @@ UI::ChangeWidget (`id(`feedback), `Enabled, false); } + if( !(boolean)UI::QueryWidget( `id(`feedback), `Value ) ) + UI::ChangeWidget (`id(`feedback_type), `Enabled, false ); + if (mode == `edit) { UI::ChangeWidget(`id(`filename), `Enabled, false); @@ -217,6 +230,7 @@ string interpreter = (string)UI::QueryWidget(`id(`interpreter), `Value); string source = (string)UI::QueryWidget(`id(`source), `Value); boolean feedback = (boolean)UI::QueryWidget(`id(`feedback), `Value); + string feedback_type = (string)UI::QueryWidget(`id(`feedback_type), `Value); boolean debug = (boolean)UI::QueryWidget(`id(`debug), `Value); boolean chrooted = (boolean)UI::QueryWidget(`id(`chrooted), `Value); boolean network = (boolean)UI::QueryWidget(`id(`network), `Value); @@ -231,7 +245,7 @@ } else { - AutoinstScripts::AddEditScript( scriptName, source, interpreter, type, chrooted, debug, feedback, network); + AutoinstScripts::AddEditScript( scriptName, source, interpreter, type, chrooted, debug, feedback, network, feedback_type); } } else if (ret == `loadsource) @@ -269,6 +283,9 @@ UI::ChangeWidget (`id(`network), `Value, false); UI::ChangeWidget (`id(`network), `Enabled, false); } + } else if( ret == `feedback ) { + UI::ChangeWidget( `id(`feedback_type), `Enabled, (boolean)UI::QueryWidget( `id(`feedback), `Value ) ); + UI::ChangeWidget( `id(`feedback_type), `Value, `id("no_type") ); } } until (ret == `save || ret == `cancel || ret == `back); Modified: trunk/autoinstallation/src/modules/AutoinstScripts.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/Aut… ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstScripts.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstScripts.ycp Wed Jul 1 13:50:19 2009 @@ -18,6 +18,7 @@ import "Service"; import "Popup"; import "Label"; + import "Report"; include "autoinstall/io.ycp"; @@ -141,8 +142,7 @@ else if (s["type"]:"" == "postpartitioning-scripts") postpart = add(postpart,s); }); - - + // clean list<map> expre = maplist (map p, pre, ``{ return ($["filename":p["filename"]:"", @@ -150,6 +150,7 @@ "source":p["source"]:"", "location":p["location"]:"", "feedback":p["feedback"]:false, + "feedback_type":p["feedback_type"]:"", "debug":p["debug"]:true ]); }); @@ -159,6 +160,7 @@ "source":p["source"]:"", "location":p["location"]:"", "feedback":p["feedback"]:false, + "feedback_type":p["feedback_type"]:"", "debug":p["debug"]:true, "network_needed":p["network_needed"]:false ] @@ -171,6 +173,7 @@ "chrooted":p["chrooted"]:false, "location":p["location"]:"", "feedback":p["feedback"]:false, + "feedback_type":p["feedback_type"]:"", "debug":p["debug"]:true ]); }); @@ -187,6 +190,7 @@ "source":p["source"]:"", "location":p["location"]:"", "feedback":p["feedback"]:false, + "feedback_type":p["feedback_type"]:"", "debug":p["debug"]:true ]); }); @@ -360,7 +364,8 @@ boolean chrooted, boolean debug, boolean feedback, - boolean network + boolean network, + string feedback_type ) { boolean mod = false; @@ -377,6 +382,7 @@ oldScript=add(oldScript,"debug",debug); oldScript=add(oldScript,"feedback",feedback); oldScript=add(oldScript,"network_needed",network); + oldScript=add(oldScript,"feedback_type", feedback_type); mod = true; return oldScript; @@ -397,6 +403,7 @@ script=add(script,"debug",debug); script=add(script,"feedback",feedback); script=add(script,"network_needed",network); + script=add(script,"feedback_type", feedback_type); merged=add(merged,script); } @@ -785,7 +792,15 @@ feedback = (string)SCR::Read(.target.string, current_logdir+"/"+scriptName+".log" ); } if( size(feedback) > 0 ) { - Popup::LongText("", `RichText(`opt(`plainText), feedback), 50, 20 ); + if( s["feedback_type"]:"" == "" ) { + Popup::LongText("", `RichText(`opt(`plainText), feedback), 50, 20 ); + } else if( s["feedback_type"]:"" == "message" ) { + Report::Message( feedback ); + } else if( s["feedback_type"]:"" == "warning" ) { + Report::Warning( feedback ); + } else if( s["feedback_type"]:"" == "error" ) { + Report::Error( feedback ); + } } } } Modified: trunk/autoinstallation/src/schema/scripts.rnc URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/schema/scri… ============================================================================== --- trunk/autoinstallation/src/schema/scripts.rnc (original) +++ trunk/autoinstallation/src/schema/scripts.rnc Wed Jul 1 13:50:19 2009 @@ -54,12 +54,14 @@ element location { text }? & source? & debug? & - feedback? + feedback? & + feedback_type? } chrooted = element chrooted { BOOLEAN } debug = element debug { BOOLEAN } feedback = element feedback { BOOLEAN } +feedback_type = element feedback_type { text } filename = element filename { text } interpreter = element interpreter { text } source = element source { text } -- 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] r57818 - in /trunk/core/dbus/namespace_service/testsuite: modules/TEST.ycp org.freedesktop.DBus.Introspectable.Introspect.test
by mvidner＠svn.opensuse.org 01 Jul '09

01 Jul '09

Author: mvidner Date: Wed Jul 1 13:28:08 2009 New Revision: 57818 URL: http://svn.opensuse.org/viewcvs/yast?rev=57818&view=rev Log: Added interfaces to test DBus->YCP value conversion (bnc#516492). Modified: trunk/core/dbus/namespace_service/testsuite/modules/TEST.ycp trunk/core/dbus/namespace_service/testsuite/org.freedesktop.DBus.Introspectable.Introspect.test Modified: trunk/core/dbus/namespace_service/testsuite/modules/TEST.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/dbus/namespace_service/test… ============================================================================== --- trunk/core/dbus/namespace_service/testsuite/modules/TEST.ycp (original) +++ trunk/core/dbus/namespace_service/testsuite/modules/TEST.ycp Wed Jul 1 13:28:08 2009 @@ -1,4 +1,3 @@ - // This is a testing module for the YaST DBuse service // Some methods are not called during tests, but the correct signature is checked in the introspection test @@ -78,7 +77,53 @@ global define void Void() {return;} -global define any ParamMap(map<string,any> m) -{return m;} +// ParamFoo: test DBus->YCP conversion +global define any ParamAny(any p) +{return p;} + +//Valid YCP but useless +//global define any ParamVoid(void p) +//{return p;} + +global define any ParamBoolean(boolean p) +{return p;} + +global define any ParamInteger(integer p) +{return p;} + +global define any ParamFloat(float p) +{return p;} + +global define any ParamString(string p) +{return p;} + +global define any ParamLocale(locale p) +{return p;} + +global define any ParamByteblock(byteblock p) +{return p;} + +global define any ParamPath(path p) +{return p;} + +global define any ParamSymbol(symbol p) +{return p;} + +global define any ParamList(list p) +{return p;} + +// FIXME this fails, expecting a plain string +//global define any ParamTerm(term p) +//{return p;} + +// inconsistent name, the first test +global define any ParamMap(map<string,any> p) +{return p;} + +global define any ParamMapA(map p) +{return p;} + +global define any ParamBlock(block<any> p) +{return p;} } Modified: trunk/core/dbus/namespace_service/testsuite/org.freedesktop.DBus.Introspectable.Introspect.test URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/dbus/namespace_service/test… ============================================================================== --- trunk/core/dbus/namespace_service/testsuite/org.freedesktop.DBus.Introspectable.Introspect.test (original) +++ trunk/core/dbus/namespace_service/testsuite/org.freedesktop.DBus.Introspectable.Introspect.test Wed Jul 1 13:28:08 2009 @@ -28,7 +28,17 @@ <method name='MapStringAny'><arg name='ret' type='a{sv}' direction='out'/></method> <method name='MapStringListString'><arg name='ret' type='a{sas}' direction='out'/></method> <method name='MapStringString'><arg name='ret' type='a{ss}' direction='out'/></method> + <method name='ParamAny'><arg name='ret' type='v' direction='out'/><arg name='param' type='v' direction='in'/></method> + <method name='ParamBoolean'><arg name='ret' type='v' direction='out'/><arg name='param' type='b' direction='in'/></method> + <method name='ParamFloat'><arg name='ret' type='v' direction='out'/><arg name='param' type='d' direction='in'/></method> + <method name='ParamInteger'><arg name='ret' type='v' direction='out'/><arg name='param' type='x' direction='in'/></method> + <method name='ParamList'><arg name='ret' type='v' direction='out'/><arg name='param' type='av' direction='in'/></method> + <method name='ParamLocale'><arg name='ret' type='v' direction='out'/><arg name='param' type='s' direction='in'/></method> <method name='ParamMap'><arg name='ret' type='v' direction='out'/><arg name='param' type='a{sv}' direction='in'/></method> + <method name='ParamMapA'><arg name='ret' type='v' direction='out'/><arg name='param' type='a{sv}' direction='in'/></method> + <method name='ParamPath'><arg name='ret' type='v' direction='out'/><arg name='param' type='s' direction='in'/></method> + <method name='ParamString'><arg name='ret' type='v' direction='out'/><arg name='param' type='s' direction='in'/></method> + <method name='ParamSymbol'><arg name='ret' type='v' direction='out'/><arg name='param' type='s' direction='in'/></method> <method name='String'><arg name='ret' type='s' direction='out'/></method> <method name='Symbol'><arg name='ret' type='s' direction='out'/></method> <method name='Void'></method> @@ -54,7 +64,19 @@ <method name='MapStringAny'><arg name='ret' type='(bsv)' direction='out'/></method> <method name='MapStringListString'><arg name='ret' type='(bsv)' direction='out'/></method> <method name='MapStringString'><arg name='ret' type='(bsv)' direction='out'/></method> + <method name='ParamAny'><arg name='ret' type='(bsv)' direction='out'/><arg name='param' type='(bsv)' direction='in'/></method> + <method name='ParamBlock'><arg name='ret' type='(bsv)' direction='out'/><arg name='param' type='(bsv)' direction='in'/></method> + <method name='ParamBoolean'><arg name='ret' type='(bsv)' direction='out'/><arg name='param' type='(bsv)' direction='in'/></method> + <method name='ParamByteblock'><arg name='ret' type='(bsv)' direction='out'/><arg name='param' type='(bsv)' direction='in'/></method> + <method name='ParamFloat'><arg name='ret' type='(bsv)' direction='out'/><arg name='param' type='(bsv)' direction='in'/></method> + <method name='ParamInteger'><arg name='ret' type='(bsv)' direction='out'/><arg name='param' type='(bsv)' direction='in'/></method> + <method name='ParamList'><arg name='ret' type='(bsv)' direction='out'/><arg name='param' type='(bsv)' direction='in'/></method> + <method name='ParamLocale'><arg name='ret' type='(bsv)' direction='out'/><arg name='param' type='(bsv)' direction='in'/></method> <method name='ParamMap'><arg name='ret' type='(bsv)' direction='out'/><arg name='param' type='(bsv)' direction='in'/></method> + <method name='ParamMapA'><arg name='ret' type='(bsv)' direction='out'/><arg name='param' type='(bsv)' direction='in'/></method> + <method name='ParamPath'><arg name='ret' type='(bsv)' direction='out'/><arg name='param' type='(bsv)' direction='in'/></method> + <method name='ParamString'><arg name='ret' type='(bsv)' direction='out'/><arg name='param' type='(bsv)' direction='in'/></method> + <method name='ParamSymbol'><arg name='ret' type='(bsv)' direction='out'/><arg name='param' type='(bsv)' direction='in'/></method> <method name='String'><arg name='ret' type='(bsv)' direction='out'/></method> <method name='Symbol'><arg name='ret' type='(bsv)' direction='out'/></method> <method name='Void'></method> -- 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] r57817 - /tags/branch-Code-11-2_17_22/product-creator/
by jsuchome＠svn.opensuse.org 01 Jul '09

01 Jul '09

Author: jsuchome Date: Wed Jul 1 10:08:34 2009 New Revision: 57817 URL: http://svn.opensuse.org/viewcvs/yast?rev=57817&view=rev Log: Created tag branch-Code-11-2_17_22 for product-creator Added: tags/branch-Code-11-2_17_22/product-creator/ - copied from r57816, branches/SuSE-Code-11-Branch/product-creator/ -- 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] r57816 - in /branches/SuSE-Code-11-Branch/product-creator: VERSION package/yast2-product-creator.changes yast2-product-creator.spec.in
by jsuchome＠svn.opensuse.org 01 Jul '09

01 Jul '09

Author: jsuchome Date: Wed Jul 1 10:08:28 2009 New Revision: 57816 URL: http://svn.opensuse.org/viewcvs/yast?rev=57816&view=rev Log: - yast2-slp not needed in BuildRequires (reverting unintended previous change) - 2.17.22 Modified: branches/SuSE-Code-11-Branch/product-creator/VERSION branches/SuSE-Code-11-Branch/product-creator/package/yast2-product-creator.changes branches/SuSE-Code-11-Branch/product-creator/yast2-product-creator.spec.in Modified: branches/SuSE-Code-11-Branch/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/product-c… ============================================================================== --- branches/SuSE-Code-11-Branch/product-creator/VERSION (original) +++ branches/SuSE-Code-11-Branch/product-creator/VERSION Wed Jul 1 10:08:28 2009 @@ -1 +1 @@ -2.17.21 +2.17.22 Modified: branches/SuSE-Code-11-Branch/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/product-c… ============================================================================== --- branches/SuSE-Code-11-Branch/product-creator/package/yast2-product-creator.changes (original) +++ branches/SuSE-Code-11-Branch/product-creator/package/yast2-product-creator.changes Wed Jul 1 10:08:28 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Jul 1 09:46:11 CEST 2009 - jsuchome(a)suse.cz + +- yast2-slp not needed in BuildRequires (reverting unintended + previous change) +- 2.17.22 + +------------------------------------------------------------------- Mon Jun 22 11:28:49 CEST 2009 - jsuchome(a)suse.cz - do not show "compression" widget for ext3 filesystems (bnc#510833) Modified: branches/SuSE-Code-11-Branch/product-creator/yast2-product-creator.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/product-c… ============================================================================== --- branches/SuSE-Code-11-Branch/product-creator/yast2-product-creator.spec.in (original) +++ branches/SuSE-Code-11-Branch/product-creator/yast2-product-creator.spec.in Wed Jul 1 10:08:28 2009 @@ -1,7 +1,7 @@ @HEADER-COMMENT@ @HEADER@ -BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite yast2-packager autoyast2-installation yast2-security yast2-add-on-creator yast2 yast2-slp +BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite yast2-packager autoyast2-installation yast2-security yast2-add-on-creator yast2 PreReq: %fillup_prereq -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0