February 2012 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r67527 - in /trunk/ldap-client: VERSION package/yast2-ldap-client.changes src/ui.ycp
by jsuchome＠svn2.opensuse.org 22 Feb '12

22 Feb '12

Author: jsuchome Date: Wed Feb 22 16:39:30 2012 New Revision: 67527 URL: http://svn.opensuse.org/viewcvs/yast?rev=67527&view=rev Log: - fixed handling of certificate download - 2.22.5 Modified: trunk/ldap-client/VERSION trunk/ldap-client/package/yast2-ldap-client.changes trunk/ldap-client/src/ui.ycp Modified: trunk/ldap-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/VERSION?rev=67527&r1… ============================================================================== --- trunk/ldap-client/VERSION (original) +++ trunk/ldap-client/VERSION Wed Feb 22 16:39:30 2012 @@ -1 +1 @@ -2.22.4 +2.22.5 Modified: trunk/ldap-client/package/yast2-ldap-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/package/yast2-ldap-c… ============================================================================== --- trunk/ldap-client/package/yast2-ldap-client.changes (original) +++ trunk/ldap-client/package/yast2-ldap-client.changes Wed Feb 22 16:39:30 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Feb 22 16:38:12 CET 2012 - jsuchome(a)suse.cz + +- fixed handling of certificate download +- 2.22.5 + +------------------------------------------------------------------- Tue Feb 21 11:06:29 CET 2012 - jsuchome(a)suse.cz - removed password policies configuration from client, relevant parts Modified: trunk/ldap-client/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/ui.ycp?rev=67527… ============================================================================== --- trunk/ldap-client/src/ui.ycp (original) +++ trunk/ldap-client/src/ui.ycp Wed Feb 22 16:39:30 2012 @@ -183,6 +183,7 @@ */ boolean SSLConfiguration () { + string certTmpFile = sformat ("%1/__LDAPcert.crt", Directory::tmpdir); string tls_cacertdir = Ldap::tls_cacertdir; string tls_cacertfile = Ldap::tls_cacertfile; UI::OpenDialog (`opt (`decorated), `HBox (`HSpacing (1), `VBox( @@ -247,6 +248,50 @@ UI::ChangeWidget (`id (`tls_cacertfile), `Value, file); } } + if (ret == `import_cert) + { + string dir = tls_cacertdir; + if (dir == "") + dir = "/etc/openldap/cacerts/"; + + boolean success = false; + string name = ""; + + string cert_url = (string) UI::QueryWidget (`id (`url), `Value); + string curlcmd = sformat("curl -f --connect-timeout 60 --max-time 120 '%1' -o %2", cert_url, certTmpFile); + + if (SCR::Execute(.target.bash, curlcmd) != 0) + { + // error message + Popup::Error (_("Could not download the certificate file from specified URL.")); + } + else if (FileUtils::CheckAndCreatePath (dir)) + { + list <string> l = splitstring (cert_url, "/"); + name = l[size(l) - 1]:"downloaded-by-yast2-ldap-client.pem"; + success = SCR::Execute (.target.bash, sformat ("/bin/cp -a '%1' '%2/%3'", certTmpFile, dir, name)) == 0; + // rehash cert directory (bnc#662937) + map out = (map)SCR::Execute (.target.bash_output, sformat ("/usr/bin/c_rehash %1", dir)); + if (out["stderr"]:"" != "") + { + y2error ("something went wrong: %1", out); + } + } + + if (success) + { + // popup message, %1 is file name, %2 directory + Popup::Message (sformat (_("The downloaded certificate file + +'%1' + +has been copied to '%2' directory. +"), name, dir)); + + tls_cacertdir = dir; + Ldap::modified = true; + } + } } while (ret != `ok && ret != `cancel); UI::CloseDialog (); @@ -323,7 +368,6 @@ boolean ldap_tls = Ldap::ldap_tls || Ldap::sssd; // force TLS to true if sssd is used string tls_checkpeer = Ldap::tls_checkpeer; boolean login_enabled = Ldap::login_enabled; - string certTmpFile = sformat ("%1/__LDAPcert.crt", Directory::tmpdir); boolean ssl_changed = false; boolean autofs = Ldap::_start_autofs; term autofs_con = `Empty (); @@ -474,82 +518,6 @@ UI::ChangeWidget (`id (`ldaps), `Value, false); } } - if (result == `import_cert) - { - string dir = Ldap::tls_cacertdir; - if (Ldap::tls_cacertdir == "") - dir = "/etc/openldap/cacerts/"; - - UI::OpenDialog ( `opt(`decorated), `HBox( - `HSpacing(1), - `VBox ( - `HSpacing (75), - // InputField label - `InputField (`id (`url), `opt (`hstretch), - _("CA Certificate URL for Download")), - `ButtonBox ( - `PushButton(`id(`ok),`opt(`default,`key_F10), Label::OKButton()), - `PushButton(`id(`cancel),`opt (`key_F9), Label::CancelButton()) - ) - ), - `HSpacing(1) - )); - UI::SetFocus (`id (`url)); - - any ret = nil; - boolean success = false; - string name = ""; - - while (true) - { - ret = UI::UserInput (); - if (ret == `cancel) - break; - if (ret == `ok) - { - string cert_url = (string) UI::QueryWidget (`id (`url), `Value); - string curlcmd = sformat("curl -f --connect-timeout 60 --max-time 120 '%1' -o %2", cert_url, certTmpFile); - - if (SCR::Execute(.target.bash, curlcmd) != 0) - { - // error message - Popup::Error (_("Could not download the certificate file from specified URL.")); - } - else if (FileUtils::CheckAndCreatePath (dir)) - { - list <string> l = splitstring (cert_url, "/"); - name = l[size(l) - 1]:"downloaded-by-yast2-ldap-client.pem"; - success = SCR::Execute (.target.bash, sformat ("/bin/cp -a '%1' '%2/%3'", certTmpFile, dir, name)) == 0; - // rehash cert directory (bnc#662937) - map out = (map)SCR::Execute (.target.bash_output, sformat ("/usr/bin/c_rehash %1", dir)); - if (out["stderr"]:"" != "") - { - y2error ("something went wrong: %1", out); - } - break; - } - } - } - UI::CloseDialog (); - - if (ret == `cancel) - { - continue; - } - if (success) - { - // popup message, %1 is file name, %2 directory - Popup::Message (sformat (_("The downloaded certificate file - -'%1' - -has been copied to '%2' directory. -"), name, dir)); - - Ldap::tls_cacertdir = dir; - Ldap::modified = true; - } - } if (result == `next || result == `advanced) { -- 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] r67526 - /trunk/s390/src/modules/ZFCPController.ycp
by aschnell＠svn2.opensuse.org 22 Feb '12

22 Feb '12

Author: aschnell Date: Wed Feb 22 15:52:26 2012 New Revision: 67526 URL: http://svn.opensuse.org/viewcvs/yast?rev=67526&view=rev Log: - fixed filter Modified: trunk/s390/src/modules/ZFCPController.ycp Modified: trunk/s390/src/modules/ZFCPController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/ZFCPController.… ============================================================================== --- trunk/s390/src/modules/ZFCPController.ycp (original) +++ trunk/s390/src/modules/ZFCPController.ycp Wed Feb 22 15:52:26 2012 @@ -406,7 +406,8 @@ list<map<string, any> > disks_tapes = (list<map<string, any> >) merge(disks, tapes); disks_tapes = maplist (map<string, any> d, disks_tapes, { - return filter(string k, any v, d, { return contains([ "dev_name", "detail" ], k); }); + return filter(string k, any v, d, { return contains([ "dev_name", "detail", + "vendor", "device" ], k); }); }); integer index = -1; -- 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] r67525 - /trunk/yast2/yast2.spec.in
by mfilka＠svn2.opensuse.org 22 Feb '12

22 Feb '12

Author: mfilka Date: Wed Feb 22 15:34:41 2012 New Revision: 67525 URL: http://svn.opensuse.org/viewcvs/yast?rev=67525&view=rev Log: removed comment from spec file Modified: trunk/yast2/yast2.spec.in Modified: trunk/yast2/yast2.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/yast2.spec.in?rev=67525&r1… ============================================================================== --- trunk/yast2/yast2.spec.in (original) +++ trunk/yast2/yast2.spec.in Wed Feb 22 15:34:41 2012 @@ -1,21 +1,3 @@ -# -# spec file for package yast2.spec.in -# -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via http://bugs.opensuse.org/ -# - - @HEADER-COMMENT@ @HEADER@ -- 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] r67524 - /trunk/yast2/yast2.spec.in
by mfilka＠svn2.opensuse.org 22 Feb '12

22 Feb '12

Author: mfilka Date: Wed Feb 22 15:31:17 2012 New Revision: 67524 URL: http://svn.opensuse.org/viewcvs/yast?rev=67524&view=rev Log: spec file updated Modified: trunk/yast2/yast2.spec.in Modified: trunk/yast2/yast2.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/yast2.spec.in?rev=67524&r1… ============================================================================== --- trunk/yast2/yast2.spec.in (original) +++ trunk/yast2/yast2.spec.in Wed Feb 22 15:31:17 2012 @@ -1,16 +1,34 @@ +# +# spec file for package yast2.spec.in +# +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + @HEADER-COMMENT@ @HEADER@ -Group: System/YaST -License: GPL-2.0+ -Source1: yast2-rpmlintrc +Group: System/YaST +License: GPL-2.0+ +Source1: yast2-rpmlintrc -BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite yast2-perl-bindings +BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-perl-bindings yast2-testsuite # Needed already in build time -BuildRequires: yast2-pkg-bindings >= 2.20.3 yast2-core >= 2.18.12 yast2-ycp-ui-bindings >= 2.18.4 +BuildRequires: yast2-core >= 2.18.12 yast2-pkg-bindings >= 2.20.3 yast2-ycp-ui-bindings >= 2.18.4 # pre-requires for filling the sysconfig template (sysconfig.yast2) -PreReq: %fillup_prereq +PreReq: %fillup_prereq # ag_ini section_private Requires: yast2-core >= 2.22.1 @@ -19,69 +37,69 @@ Requires: yast2-ycp-ui-bindings >= 2.18.4 # changed StartPackage callback signature -Requires: yast2-pkg-bindings >= 2.20.3 -Requires: yast2_ui +Requires: yast2-pkg-bindings >= 2.20.3 +Requires: yast2_ui # For Cron Agent, Module Requires: perl-Config-Crontab # for ag_tty (/bin/stty) # for /usr/bin/md5sum -Requires: coreutils sysconfig -Requires: yast2-xml yast2-hardware-detection +Requires: coreutils sysconfig +Requires: yast2-xml yast2-hardware-detection # for SLPAPI.pm -Requires: yast2-perl-bindings +Requires: yast2-perl-bindings # for ag_anyxml -Requires: perl-XML-Simple +Requires: perl-XML-Simple # for GPG.ycp -Requires: gpg2 +Requires: gpg2 # for Punycode.ycp (bnc#651893) -Requires: bind-utils +Requires: bind-utils # xdg-su in .desktops -Recommends: xdg-utils +Recommends: xdg-utils # moved cfg_security.scr -Conflicts: yast2-security <= 2.13.2 +Conflicts: yast2-security <= 2.13.2 # moved ag_netd, cfg_netd.scr, cfg_xinetd.scr -Conflicts: yast2-inetd <= 2.13.4 -Conflicts: yast2-tune < 2.15.6 -Obsoletes: yast2-mail-aliases <= 2.14.0 -Conflicts: yast2-storage < 2.16.4 -Conflicts: yast2-network < 2.16.6 -Conflicts: yast2-sshd < 2.16.1 +Conflicts: yast2-inetd <= 2.13.4 +Conflicts: yast2-tune < 2.15.6 +Obsoletes: yast2-mail-aliases <= 2.14.0 +Conflicts: yast2-storage < 2.16.4 +Conflicts: yast2-network < 2.16.6 +Conflicts: yast2-sshd < 2.16.1 # moved ag_content agent -Conflicts: yast2-instserver <= 2.16.3 +Conflicts: yast2-instserver <= 2.16.3 # InstError -Conflicts: yast2-installation < 2.18.5 +Conflicts: yast2-installation < 2.18.5 -Conflicts: yast2-update < 2.16.1 +Conflicts: yast2-update < 2.16.1 # Modules 'Slides' and 'SlideShow' moved from yast2-packager to yast2 -Conflicts: yast2-packager < 2.17.12 -Conflicts: yast2-mouse < 2.16.0 -Conflicts: autoyast2-installation < 2.16.2 +Conflicts: yast2-packager < 2.17.12 +Conflicts: yast2-mouse < 2.16.0 +Conflicts: autoyast2-installation < 2.16.2 # country_long.ycp and country.ycp moved to yast2 -Conflicts: yast2-country < 2.16.3 +Conflicts: yast2-country < 2.16.3 # DnsServerAPI moved to yast2.rpm (by mzugec) -Conflicts: yast2-dns-server < 2.17.0 +Conflicts: yast2-dns-server < 2.17.0 -Provides: yast2-lib-sequencer -Obsoletes: yast2-lib-sequencer -Provides: yast2-lib-wizard yast2-lib-wizard-devel yast2-trans-wizard -Obsoletes: yast2-lib-wizard yast2-lib-wizard-devel yast2-trans-wizard -Provides: yast2-trans-menu y2t_menu -Obsoletes: yast2-trans-menu y2t_menu +Provides: yast2-lib-sequencer +Obsoletes: yast2-lib-sequencer +Provides: yast2-lib-wizard yast2-lib-wizard-devel yast2-trans-wizard +Obsoletes: yast2-lib-wizard yast2-lib-wizard-devel yast2-trans-wizard +Provides: yast2-trans-menu y2t_menu +Obsoletes: yast2-trans-menu y2t_menu # moved here from another packages -Provides: yast2-installation:/usr/share/YaST2/modules/Installation.ycp -Provides: yast2-installation:/usr/share/YaST2/modules/Product.ycp -Provides: yast2-installation:/usr/share/YaST2/modules/Hotplug.ycp -Provides: yast2-installation:/usr/share/YaST2/modules/HwStatus.ycp -Provides: yast2-network:/usr/share/YaST2/modules/Internet.ycp -Provides: yast2-packager:/usr/lib/YaST2/servers_non_y2/ag_anyxml -Provides: yast2-dns-server:/usr/share/YaST2/modules/DnsServerAPI.pm +Provides: yast2-installation:/usr/share/YaST2/modules/Installation.ycp +Provides: yast2-installation:/usr/share/YaST2/modules/Product.ycp +Provides: yast2-installation:/usr/share/YaST2/modules/Hotplug.ycp +Provides: yast2-installation:/usr/share/YaST2/modules/HwStatus.ycp +Provides: yast2-network:/usr/share/YaST2/modules/Internet.ycp +Provides: yast2-packager:/usr/lib/YaST2/servers_non_y2/ag_anyxml +Provides: yast2-dns-server:/usr/share/YaST2/modules/DnsServerAPI.pm Provides: yast2-mail-aliases -Summary: YaST2 - Main Package +Summary: YaST2 - Main Package %description This package contains scripts and data needed for SuSE Linux @@ -90,13 +108,13 @@ %package devel-doc Requires: yast2 = %version Group: System/YaST -Provides: yast2-lib-sequencer-devel -Obsoletes: yast2-lib-sequencer-devel -Obsoletes: yast2-devel -Provides: yast2-devel -Requires: yast2-core-devel +Provides: yast2-lib-sequencer-devel +Obsoletes: yast2-lib-sequencer-devel +Obsoletes: yast2-devel +Provides: yast2-devel +Requires: yast2-core-devel -Summary: YaST2 - Development Scripts and Documentation +Summary: YaST2 - Development Scripts and Documentation %description devel-doc This package contains scripts and data needed for a SUSE Linux @@ -185,6 +203,7 @@ @yncludedir@/hwinfo/*.ycp # documentation + %files devel-doc %defattr(-,root,root) @@ -204,3 +223,5 @@ %doc @docdir@/types %doc @docdir@/wizard %doc @docdir@/xml + +%changelog -- 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] r67523 - /trunk/core/libycp/src/YCPBuiltinInteger.cc
by aschnell＠svn2.opensuse.org 22 Feb '12

22 Feb '12

Author: aschnell Date: Wed Feb 22 15:23:28 2012 New Revision: 67523 URL: http://svn.opensuse.org/viewcvs/yast?rev=67523&view=rev Log: - fixed example Modified: trunk/core/libycp/src/YCPBuiltinInteger.cc Modified: trunk/core/libycp/src/YCPBuiltinInteger.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/src/YCPBuiltinIntege… ============================================================================== --- trunk/core/libycp/src/YCPBuiltinInteger.cc (original) +++ trunk/core/libycp/src/YCPBuiltinInteger.cc Wed Feb 22 15:23:28 2012 @@ -321,7 +321,7 @@ * @param integer base * @return integer * - * @usage tointeger("20", 8) -> 8 + * @usage tointeger("20", 8) -> 16 * @usage tointeger("20", 10) -> 20 * @usage tointeger("20", 16) -> 32 * @usage tointeger("0x20", 16) -> 32 -- 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] r67522 - /trunk/yast2/package/yast2.changes
by mfilka＠svn2.opensuse.org 22 Feb '12

22 Feb '12

Author: mfilka Date: Wed Feb 22 15:22:51 2012 New Revision: 67522 URL: http://svn.opensuse.org/viewcvs/yast?rev=67522&view=rev Log: changelog updated Modified: trunk/yast2/package/yast2.changes Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Wed Feb 22 15:22:51 2012 @@ -2,7 +2,9 @@ Wed Feb 22 12:57:01 UTC 2012 - mfilka(a)suse.com - bnc#694582 - addedd @ as it is allowed in authority part of URI. -- fixed testsuite for WorkFlow.ycp - corrupted due to previous commit +- improve Exists(), don't return 'true' if SCR::Read() returned nil +- fixed testsuite for WorkFlow.ycp - corrupted due to above Exists() fix +- added String::YesNo - 2.22.4 ------------------------------------------------------------------- -- 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] r67521 - in /trunk/core: ./ libycp/src/ libycp/testsuite/tests/builtin/ package/
by aschnell＠svn2.opensuse.org 22 Feb '12

22 Feb '12

Author: aschnell Date: Wed Feb 22 15:19:20 2012 New Revision: 67521 URL: http://svn.opensuse.org/viewcvs/yast?rev=67521&view=rev Log: - added tointeger builtin with explicite base qualification Modified: trunk/core/VERSION trunk/core/libycp/src/YCPBuiltinInteger.cc trunk/core/libycp/testsuite/tests/builtin/Builtin-Integer.err trunk/core/libycp/testsuite/tests/builtin/Builtin-Integer.out trunk/core/libycp/testsuite/tests/builtin/Builtin-Integer.ycp trunk/core/package/yast2-core.changes Modified: trunk/core/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/VERSION?rev=67521&r1=67520&… ============================================================================== --- trunk/core/VERSION (original) +++ trunk/core/VERSION Wed Feb 22 15:19:20 2012 @@ -1 +1 @@ -2.22.3 +2.22.4 Modified: trunk/core/libycp/src/YCPBuiltinInteger.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/src/YCPBuiltinIntege… ============================================================================== --- trunk/core/libycp/src/YCPBuiltinInteger.cc (original) +++ trunk/core/libycp/src/YCPBuiltinInteger.cc Wed Feb 22 15:19:20 2012 @@ -18,6 +18,8 @@ /-*/ +#include <sstream> + #include "ycp/YCPBuiltinInteger.h" #include "ycp/YCPInteger.h" #include "ycp/YCPString.h" @@ -40,7 +42,7 @@ * 1 + 2 -> 3 * </pre> */ - + if (i1.isNull () || i2.isNull ()) return YCPNull (); @@ -264,15 +266,16 @@ static YCPValue -i_tointeger (const YCPValue &v) +i_tointeger1(const YCPValue &v) { /** * @builtin tointeger + * @id tointeger-1 * @short Converts a value to an integer. * @description * If the value can't be converted to an integer, nil is returned. * @param any VALUE - * @return integer + * @return integer * * @usage tointeger (4.03) -> 4 * @usage tointeger ("42") -> 42 @@ -305,6 +308,48 @@ } +static YCPValue +i_tointeger2(const YCPString& v, const YCPInteger& b) +{ + /** + * @builtin tointeger + * @id tointeger-2 + * @short Converts a string to an integer. + * @description + * If the value can't be converted to an integer, nil is returned. + * @param string value + * @param integer base + * @return integer + * + * @usage tointeger("20", 8) -> 8 + * @usage tointeger("20", 10) -> 20 + * @usage tointeger("20", 16) -> 32 + * @usage tointeger("0x20", 16) -> 32 + */ + + std::istringstream s(v->value_cstr()); + s.imbue(std::locale::classic()); + + switch (b->value()) + { + case 8: s >> std::oct; break; + case 10: s >> std::dec; break; + case 16: s >> std::hex; break; + + default: + return YCPNull(); + } + + long long int i; + s >> i; + + if (s.fail() || !s.eof()) + return YCPNull(); + + return YCPInteger(i); +} + + YCPBuiltinInteger::YCPBuiltinInteger () { // must be static, registerDeclarations saves a pointer to it! @@ -323,7 +368,8 @@ { "<<", "integer (integer, integer)", (void *)i_left, ETC }, { ">>", "integer (integer, integer)", (void *)i_right, ETC }, { "~", "integer (integer)", (void *)i_bnot, ETC }, - { "tointeger", "integer (const any)", (void *)i_tointeger,ETC }, + { "tointeger", "integer (const any)", (void *)i_tointeger1, ETC }, + { "tointeger", "integer (string, integer)", (void *)i_tointeger2, ETC }, { NULL, NULL, NULL, ETC } #undef ETC #undef ETCf Modified: trunk/core/libycp/testsuite/tests/builtin/Builtin-Integer.err URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/testsuite/tests/buil… ============================================================================== --- trunk/core/libycp/testsuite/tests/builtin/Builtin-Integer.err (original) +++ trunk/core/libycp/testsuite/tests/builtin/Builtin-Integer.err Wed Feb 22 15:19:20 2012 @@ -161,3 +161,55 @@ (tointeger ("foo") == nil) ---------------------------------------------------------------------- [Interpreter] tests/builtin/Builtin-Integer.ycp:74 Cannot convert 'foo' to an integer +Parsed: +---------------------------------------------------------------------- +"** conversions with explicite base **" +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +(tointeger ("1", 8) == 1) +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +(tointeger ("1", 10) == 1) +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +(tointeger ("1", 16) == 1) +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +(tointeger ("10", 8) == 8) +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +(tointeger ("10", 10) == 10) +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +(tointeger ("10", 16) == 16) +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +(tointeger ("010", 8) == 8) +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +(tointeger ("010", 10) == 10) +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +(tointeger ("010", 16) == 16) +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +(tointeger ("0x10", 8) == nil) +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +(tointeger ("0x10", 10) == nil) +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +(tointeger ("0x10", 16) == 16) +---------------------------------------------------------------------- Modified: trunk/core/libycp/testsuite/tests/builtin/Builtin-Integer.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/testsuite/tests/buil… ============================================================================== --- trunk/core/libycp/testsuite/tests/builtin/Builtin-Integer.out (original) +++ trunk/core/libycp/testsuite/tests/builtin/Builtin-Integer.out Wed Feb 22 15:19:20 2012 @@ -38,3 +38,16 @@ (true) (true) (true) +("** conversions with explicite base **") +(true) +(true) +(true) +(true) +(true) +(true) +(true) +(true) +(true) +(true) +(true) +(true) Modified: trunk/core/libycp/testsuite/tests/builtin/Builtin-Integer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/testsuite/tests/buil… ============================================================================== --- trunk/core/libycp/testsuite/tests/builtin/Builtin-Integer.ycp (original) +++ trunk/core/libycp/testsuite/tests/builtin/Builtin-Integer.ycp Wed Feb 22 15:19:20 2012 @@ -72,3 +72,20 @@ (tointeger ("042") == 34) (tointeger ("") == nil) (tointeger ("foo") == nil) + + +("** conversions with explicite base **") + +(tointeger ("1", 8) == 1) +(tointeger ("1", 10) == 1) +(tointeger ("1", 16) == 1) +(tointeger ("10", 8) == 8) +(tointeger ("10", 10) == 10) +(tointeger ("10", 16) == 16) +(tointeger ("010", 8) == 8) +(tointeger ("010", 10) == 10) +(tointeger ("010", 16) == 16) +(tointeger ("0x10", 8) == nil) +(tointeger ("0x10", 10) == nil) +(tointeger ("0x10", 16) == 16) + Modified: trunk/core/package/yast2-core.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/package/yast2-core.changes?… ============================================================================== --- trunk/core/package/yast2-core.changes (original) +++ trunk/core/package/yast2-core.changes Wed Feb 22 15:19:20 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Feb 22 14:59:37 CET 2012 - aschnell(a)suse.de + +- added tointeger builtin with explicite base qualification +- 2.22.4 + +------------------------------------------------------------------- Fri Feb 3 14:36:31 CET 2012 - mvidner(a)suse.cz - ini-agent: only change permissions of new files (bnc#743355) -- 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] r67520 - /trunk/ncurses-pkg/src/NCPkgFilterRPMGroups.cc
by gs＠svn2.opensuse.org 22 Feb '12

22 Feb '12

Author: gs Date: Wed Feb 22 15:12:55 2012 New Revision: 67520 URL: http://svn.opensuse.org/viewcvs/yast?rev=67520&view=rev Log: use yuiDebug to log info Modified: trunk/ncurses-pkg/src/NCPkgFilterRPMGroups.cc Modified: trunk/ncurses-pkg/src/NCPkgFilterRPMGroups.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgFilterRPMGr… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgFilterRPMGroups.cc (original) +++ trunk/ncurses-pkg/src/NCPkgFilterRPMGroups.cc Wed Feb 22 15:12:55 2012 @@ -217,7 +217,7 @@ // is the requested rpm group a prefix of this package's group? if ( pkg->group ().find (group_str) == 0 ) { - yuiError() << slb->name() << endl; + yuiDebug() << slb->name() << endl; packageList->createListEntry( pkg, slb ); return true; -- 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] r67519 - /trunk/ncurses-pkg/src/NCPkgTable.cc
by gs＠svn2.opensuse.org 22 Feb '12

22 Feb '12

Author: gs Date: Wed Feb 22 15:12:10 2012 New Revision: 67519 URL: http://svn.opensuse.org/viewcvs/yast?rev=67519&view=rev Log: remove obsolete code Modified: trunk/ncurses-pkg/src/NCPkgTable.cc Modified: trunk/ncurses-pkg/src/NCPkgTable.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgTable.cc?re… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgTable.cc (original) +++ trunk/ncurses-pkg/src/NCPkgTable.cc Wed Feb 22 15:12:10 2012 @@ -755,7 +755,6 @@ // show the patch info if (objPtr && slbPtr ) updateInfo( objPtr, slbPtr, VisibleInfo() ); - //packager->showPatchInformation( objPtr, slbPtr ); break; default: break; -- 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] r67518 - /tags/stable-2_22_4/yast2/
by mfilka＠svn2.opensuse.org 22 Feb '12

22 Feb '12

Author: mfilka Date: Wed Feb 22 15:08:20 2012 New Revision: 67518 URL: http://svn.opensuse.org/viewcvs/yast?rev=67518&view=rev Log: Created tag stable-2_22_4 for yast2 Added: tags/stable-2_22_4/yast2/ (props changed) - copied from r67517, trunk/yast2/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0