April 2012 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r67884 - in /trunk/fingerprint-reader: VERSION agent-fprint/src/FPrintAgent.cc package/yast2-fingerprint-reader.changes src/users_plugin_fingerprint_reader.ycp
by jsuchome＠svn2.opensuse.org 10 Apr '12

10 Apr '12

Author: jsuchome Date: Tue Apr 10 16:20:11 2012 New Revision: 67884 URL: http://svn.opensuse.org/viewcvs/yast?rev=67884&view=rev Log: - added Retry button, do not show two Cancel buttons (bnc#680117) - reduce agent logging - 2.22.3 Modified: trunk/fingerprint-reader/VERSION trunk/fingerprint-reader/agent-fprint/src/FPrintAgent.cc trunk/fingerprint-reader/package/yast2-fingerprint-reader.changes trunk/fingerprint-reader/src/users_plugin_fingerprint_reader.ycp Modified: trunk/fingerprint-reader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/VERSION?rev=6… ============================================================================== --- trunk/fingerprint-reader/VERSION (original) +++ trunk/fingerprint-reader/VERSION Tue Apr 10 16:20:11 2012 @@ -1 +1 @@ -2.22.2 +2.22.3 Modified: trunk/fingerprint-reader/agent-fprint/src/FPrintAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/agent-fprint/… ============================================================================== --- trunk/fingerprint-reader/agent-fprint/src/FPrintAgent.cc (original) +++ trunk/fingerprint-reader/agent-fprint/src/FPrintAgent.cc Tue Apr 10 16:20:11 2012 @@ -145,7 +145,7 @@ r = fp_enroll_finger (dev, &enrolled_print); - y2internal ("retval: %d", r); + y2debug ("retval: %d", r); if (r < 0) { y2error ("Enroll failed with error %d", r); @@ -216,7 +216,7 @@ */ YCPValue FPrintAgent::Read(const YCPPath &path, const YCPValue& arg, const YCPValue& opt) { - y2internal ("Path in Read(): %s", path->toString().c_str()); + y2debug ("Path in Read(): %s", path->toString().c_str()); YCPValue ret = YCPVoid(); if (path->length() == 0) { Modified: trunk/fingerprint-reader/package/yast2-fingerprint-reader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/package/yast2… ============================================================================== --- trunk/fingerprint-reader/package/yast2-fingerprint-reader.changes (original) +++ trunk/fingerprint-reader/package/yast2-fingerprint-reader.changes Tue Apr 10 16:20:11 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Apr 10 16:15:27 CEST 2012 - jsuchome(a)suse.cz + +- added Retry button, do not show two Cancel buttons (bnc#680117) +- reduce agent logging +- 2.22.3 + +------------------------------------------------------------------- Thu Mar 29 14:40:12 CEST 2012 - jsuchome(a)suse.cz - merged proofread texts Modified: trunk/fingerprint-reader/src/users_plugin_fingerprint_reader.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/src/users_plu… ============================================================================== --- trunk/fingerprint-reader/src/users_plugin_fingerprint_reader.ycp (original) +++ trunk/fingerprint-reader/src/users_plugin_fingerprint_reader.ycp Tue Apr 10 16:20:11 2012 @@ -89,7 +89,9 @@ `Label (`id (`label), _("Initializing fingerprint reader...")) ), `ReplacePoint (`id (`rpstatus), `VSpacing ()), - `PushButton (`id (`cancel), Label::CancelButton ()), + `ReplacePoint (`id (`rpbutton), + `PushButton (`id (`cancel), Label::CancelButton ()) + ), `ReplacePoint (`id (`rpswipes), `VSpacing ()), `VSpacing (0.5) ), @@ -104,8 +106,8 @@ Label::CancelButton(), Label::OKButton()); Wizard::HideAbortButton (); + Wizard::HideBackButton (); Wizard::DisableNextButton (); - Wizard::DisableBackButton (); boolean exit = false; any ui = nil; @@ -143,6 +145,12 @@ UI::ReplaceWidget (`id (`rpstatus), `Label (message)); } + // retry acquiring fingerprint + boolean retry = true; + while (retry) + { + retry = false; + if (SCR::Execute (.fprint.enroll, fingerprint_dir) != true) { ui = `cancel; @@ -271,8 +279,8 @@ UI::ReplaceWidget (`id (`rp), `Label (_("Fingerprint acquired successfully."))); UI::ReplaceWidget (`id (`rpstatus), `Label ("")); // new id was already saved - Wizard::DisableBackButton (); Wizard::EnableNextButton (); + UI::ChangeWidget (`id (`cancel), `Enabled, false); } else { @@ -299,10 +307,25 @@ { status_message (error, details); } - Wizard::EnableBackButton (); + if (ui == `cancel) + { + UI::ChangeWidget (`id (`cancel), `Enabled, false); + } + else + { + // button label + UI::ReplaceWidget (`id (`rpbutton), `PushButton (`id (`retry), _("Retry"))); + Wizard::RestoreBackButton (); + } } - UI::ChangeWidget (`id (`cancel), `Enabled, false); - ret = UI::UserInput (); + if (ui != `cancel) + { + ret = UI::UserInput (); + } + else + { + ret = `cancel; + } if (ret == `next) { // modified data to add to user @@ -316,6 +339,13 @@ else if (data["what"]:"" == "add_user") Users::AddUser (tmp_data); } + else if (ret == `retry) + { + UI::ReplaceWidget (`id (`rpbutton), `PushButton (`id (`cancel), Label::CancelButton ())); + Wizard::HideBackButton (); + retry = true; + } + } Wizard::CloseDialog (); } y2milestone("users plugin finished with %1", ret); -- 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] r67883 - /trunk/proxy/yast2-proxy.spec.in
by mvidner＠svn2.opensuse.org 10 Apr '12

10 Apr '12

Author: mvidner Date: Tue Apr 10 16:15:41 2012 New Revision: 67883 URL: http://svn.opensuse.org/viewcvs/yast?rev=67883&view=rev Log: license in spdx format; url; conflict with our old copy Modified: trunk/proxy/yast2-proxy.spec.in Modified: trunk/proxy/yast2-proxy.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/proxy/yast2-proxy.spec.in?rev=67… ============================================================================== --- trunk/proxy/yast2-proxy.spec.in (original) +++ trunk/proxy/yast2-proxy.spec.in Tue Apr 10 16:15:41 2012 @@ -2,7 +2,7 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ # should be required by devtools BuildRequires: perl-XML-Writer pkgconfig rpm BuildRequires: update-desktop-files @@ -11,9 +11,13 @@ BuildRequires: yast2 Requires: yast2 +# we split off that one +Conflicts: yast2-network < 2.22.6 + PreReq: /bin/rm Summary: YaST2 - Proxy Configuration +Url: http://en.opensuse.org/Portal:YaST %description This package contains the YaST2 component for proxy configuration. -- 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] r67882 - /trunk/proxy/yast2-proxy.spec.in
by mvidner＠svn2.opensuse.org 10 Apr '12

10 Apr '12

Author: mvidner Date: Tue Apr 10 16:10:42 2012 New Revision: 67882 URL: http://svn.opensuse.org/viewcvs/yast?rev=67882&view=rev Log: reformatted with prepare_spec Modified: trunk/proxy/yast2-proxy.spec.in Modified: trunk/proxy/yast2-proxy.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/proxy/yast2-proxy.spec.in?rev=67… ============================================================================== --- trunk/proxy/yast2-proxy.spec.in (original) +++ trunk/proxy/yast2-proxy.spec.in Tue Apr 10 16:10:42 2012 @@ -1,19 +1,19 @@ @HEADER-COMMENT@ @HEADER@ -Group: System/YaST -License: GPL v2 or later +Group: System/YaST +License: GPL v2 or later # should be required by devtools -BuildRequires: pkgconfig perl-XML-Writer rpm -BuildRequires: update-desktop-files -BuildRequires: yast2-devtools yast2-testsuite +BuildRequires: perl-XML-Writer pkgconfig rpm +BuildRequires: update-desktop-files +BuildRequires: yast2-devtools yast2-testsuite -BuildRequires: yast2 -Requires: yast2 +BuildRequires: yast2 +Requires: yast2 -PreReq: /bin/rm +PreReq: /bin/rm -Summary: YaST2 - Proxy Configuration +Summary: YaST2 - Proxy Configuration %description This package contains the YaST2 component for proxy configuration. @@ -38,3 +38,5 @@ %dir @docdir@ @docdir@/COPYING %readme @docdir@/README + +%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] r67881 - /tags/stable-2_22_0/slp/
by jsuchome＠svn2.opensuse.org 10 Apr '12

10 Apr '12

Author: jsuchome Date: Tue Apr 10 15:59:34 2012 New Revision: 67881 URL: http://svn.opensuse.org/viewcvs/yast?rev=67881&view=rev Log: Created tag stable-2_22_0 for slp Added: tags/stable-2_22_0/slp/ - copied from r67880, trunk/slp/ -- 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] r67880 - in /trunk/slp: VERSION package/yast2-slp.changes
by jsuchome＠svn2.opensuse.org 10 Apr '12

10 Apr '12

Author: jsuchome Date: Tue Apr 10 15:59:21 2012 New Revision: 67880 URL: http://svn.opensuse.org/viewcvs/yast?rev=67880&view=rev Log: - 2.22.0 Modified: trunk/slp/VERSION trunk/slp/package/yast2-slp.changes Modified: trunk/slp/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/slp/VERSION?rev=67880&r1=67879&r… ============================================================================== --- trunk/slp/VERSION (original) +++ trunk/slp/VERSION Tue Apr 10 15:59:21 2012 @@ -1 +1 @@ -2.21.0 +2.22.0 Modified: trunk/slp/package/yast2-slp.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/slp/package/yast2-slp.changes?re… ============================================================================== --- trunk/slp/package/yast2-slp.changes (original) +++ trunk/slp/package/yast2-slp.changes Tue Apr 10 15:59:21 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Apr 10 15:59:00 CEST 2012 - jsuchome(a)suse.cz + +- 2.22.0 + +------------------------------------------------------------------- Tue Apr 10 15:54:34 CEST 2012 - tgoettlicher(a)suse.de - BuildRequire libxcrypt-devel only for < 12.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] r67879 - in /trunk/transfer: package/yast2-transfer.changes yast2-transfer.spec.in
by tgoettlicher＠svn2.opensuse.org 10 Apr '12

10 Apr '12

Author: tgoettlicher Date: Tue Apr 10 15:57:28 2012 New Revision: 67879 URL: http://svn.opensuse.org/viewcvs/yast?rev=67879&view=rev Log: BuildRequire libxcrypt-devel only for < 12.2 Modified: trunk/transfer/package/yast2-transfer.changes trunk/transfer/yast2-transfer.spec.in Modified: trunk/transfer/package/yast2-transfer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/transfer/package/yast2-transfer.… ============================================================================== --- trunk/transfer/package/yast2-transfer.changes (original) +++ trunk/transfer/package/yast2-transfer.changes Tue Apr 10 15:57:28 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Apr 10 15:57:11 CEST 2012 - tgoettlicher(a)suse.de + +- BuildRequire libxcrypt-devel only for < 12.2 + +------------------------------------------------------------------- Fri Nov 25 12:26:08 UTC 2011 - coolo(a)suse.com - add libtool as buildrequire to avoid implicit dependency Modified: trunk/transfer/yast2-transfer.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/transfer/yast2-transfer.spec.in?… ============================================================================== --- trunk/transfer/yast2-transfer.spec.in (original) +++ trunk/transfer/yast2-transfer.spec.in Tue Apr 10 15:57:28 2012 @@ -4,6 +4,9 @@ Group: System/YaST License: GPL-2.0+ BuildRequires: curl-devel gcc-c++ perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite doxygen yast2-core-devel libtool +%if 0%{?suse_version} < 1220 +BuildRequires: libxcrypt-devel +%endif Summary: YaST2 - Agent for Various Transfer Protocols Provides: yast2-agent-curl yast2-agent-tftp yast2-agent-curl-devel yast2-agent-tftp-devel Obsoletes: yast2-agent-curl yast2-agent-tftp yast2-agent-curl-devel yast2-agent-tftp-devel -- 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] r67878 - in /trunk/slp: package/yast2-slp.changes yast2-slp.spec.in
by tgoettlicher＠svn2.opensuse.org 10 Apr '12

10 Apr '12

Author: tgoettlicher Date: Tue Apr 10 15:55:07 2012 New Revision: 67878 URL: http://svn.opensuse.org/viewcvs/yast?rev=67878&view=rev Log: BuildRequire libxcrypt-devel only for < 12.2 Modified: trunk/slp/package/yast2-slp.changes trunk/slp/yast2-slp.spec.in Modified: trunk/slp/package/yast2-slp.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/slp/package/yast2-slp.changes?re… ============================================================================== --- trunk/slp/package/yast2-slp.changes (original) +++ trunk/slp/package/yast2-slp.changes Tue Apr 10 15:55:07 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Apr 10 15:54:34 CEST 2012 - tgoettlicher(a)suse.de + +- BuildRequire libxcrypt-devel only for < 12.2 + +------------------------------------------------------------------- Fri Nov 25 12:25:11 UTC 2011 - coolo(a)suse.com - add libtool as buildrequire to avoid implicit dependency Modified: trunk/slp/yast2-slp.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/slp/yast2-slp.spec.in?rev=67878&… ============================================================================== --- trunk/slp/yast2-slp.spec.in (original) +++ trunk/slp/yast2-slp.spec.in Tue Apr 10 15:55:07 2012 @@ -4,6 +4,9 @@ Group: System/YaST License: GPL-2.0+ BuildRequires: gcc-c++ openslp-devel doxygen perl-XML-Writer yast2-devtools yast2-core-devel yast2 libtool +%if 0%{?suse_version} < 1220 +BuildRequires: libxcrypt-devel +%endif Requires: openslp # Wizard::SetDesktopTitleAndIcon Requires: yast2 >= 2.21.22 -- 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] r67877 - /trunk/python-bindings/yast2-python-bindings.spec.in
by tgoettlicher＠svn2.opensuse.org 10 Apr '12

10 Apr '12

Author: tgoettlicher Date: Tue Apr 10 15:53:25 2012 New Revision: 67877 URL: http://svn.opensuse.org/viewcvs/yast?rev=67877&view=rev Log: BuildRequire libxcrypt-devel only for < 12.2 Modified: trunk/python-bindings/yast2-python-bindings.spec.in Modified: trunk/python-bindings/yast2-python-bindings.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/yast2-python-bin… ============================================================================== --- trunk/python-bindings/yast2-python-bindings.spec.in (original) +++ trunk/python-bindings/yast2-python-bindings.spec.in Tue Apr 10 15:53:25 2012 @@ -12,6 +12,9 @@ BuildRequires: yast2-ycp-ui-bindings-devel >= 2.16.37 Requires: yast2-ycp-ui-bindings >= 2.16.37 Requires: python +%if 0%{?suse_version} < 1220 +BuildRequires: libxcrypt-devel +%endif Summary: Python bindings for the YaST platform. -- 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] r67876 - /trunk/perl-bindings/yast2-perl-bindings.spec.in
by tgoettlicher＠svn2.opensuse.org 10 Apr '12

10 Apr '12

Author: tgoettlicher Date: Tue Apr 10 15:52:27 2012 New Revision: 67876 URL: http://svn.opensuse.org/viewcvs/yast?rev=67876&view=rev Log: BuildRequire libxcrypt-devel only for < 12.2 Modified: trunk/perl-bindings/yast2-perl-bindings.spec.in Modified: trunk/perl-bindings/yast2-perl-bindings.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/perl-bindings/yast2-perl-binding… ============================================================================== --- trunk/perl-bindings/yast2-perl-bindings.spec.in (original) +++ trunk/perl-bindings/yast2-perl-bindings.spec.in Tue Apr 10 15:52:27 2012 @@ -10,6 +10,9 @@ BuildRequires: yast2-ycp-ui-bindings-devel >= 2.16.37 Requires: yast2-ycp-ui-bindings >= 2.16.37 Requires: perl = %{perl_version} +%if 0%{?suse_version} < 1220 +BuildRequires: libxcrypt-devel +%endif # for YaPI.pm Requires: perl(Locale::gettext) -- 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] r67875 - in /trunk/proxy/src: clients/proxy.ycp clients/proxy_auto.ycp clients/proxy_proposal.ycp modules/Proxy.ycp
by mvidner＠svn2.opensuse.org 10 Apr '12

10 Apr '12

Author: mvidner Date: Tue Apr 10 15:44:18 2012 New Revision: 67875 URL: http://svn.opensuse.org/viewcvs/yast?rev=67875&view=rev Log: removing dependencies on network: includes, textdomain Modified: trunk/proxy/src/clients/proxy.ycp trunk/proxy/src/clients/proxy_auto.ycp trunk/proxy/src/clients/proxy_proposal.ycp trunk/proxy/src/modules/Proxy.ycp Modified: trunk/proxy/src/clients/proxy.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/proxy/src/clients/proxy.ycp?rev=… ============================================================================== --- trunk/proxy/src/clients/proxy.ycp (original) +++ trunk/proxy/src/clients/proxy.ycp Tue Apr 10 15:44:18 2012 @@ -12,7 +12,7 @@ { -textdomain "network"; +textdomain "proxy"; /* The main () */ y2milestone("----------------------------------------"); Modified: trunk/proxy/src/clients/proxy_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/proxy/src/clients/proxy_auto.ycp… ============================================================================== --- trunk/proxy/src/clients/proxy_auto.ycp (original) +++ trunk/proxy/src/clients/proxy_auto.ycp Tue Apr 10 15:44:18 2012 @@ -21,7 +21,7 @@ { -textdomain "network"; +textdomain "proxy"; y2milestone("----------------------------------------"); y2milestone("Proxy auto started"); Modified: trunk/proxy/src/clients/proxy_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/proxy/src/clients/proxy_proposal… ============================================================================== --- trunk/proxy/src/clients/proxy_proposal.ycp (original) +++ trunk/proxy/src/clients/proxy_proposal.ycp Tue Apr 10 15:44:18 2012 @@ -13,7 +13,7 @@ { -textdomain "network"; +textdomain "proxy"; /* The main () */ y2milestone("----------------------------------------"); Modified: trunk/proxy/src/modules/Proxy.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/proxy/src/modules/Proxy.ycp?rev=… ============================================================================== --- trunk/proxy/src/modules/Proxy.ycp (original) +++ trunk/proxy/src/modules/Proxy.ycp Tue Apr 10 15:44:18 2012 @@ -13,13 +13,12 @@ { module "Proxy"; -textdomain "network"; +textdomain "proxy"; import "Summary"; import "Progress"; - -include "network/routines.ycp"; -include "network/runtime.ycp"; +import "Mode"; +import "Popup"; global boolean proposal_valid = false; global boolean write_only = false; @@ -41,11 +40,28 @@ * Display popup at the end of the proxy configuration * @param modified true if proxy settings have been modified */ -define void ProxyFinishPopup(boolean modified) ``{ +void ProxyFinishPopup(boolean modified) { + if(!modified) return; -string text = _("It is recommended to relogin to make new proxy settings effective."); + /* Popup headline */ + string head = _("Proxy Configuration Successfully Saved"); + string text = _("It is recommended to relogin to make new proxy settings effective."); + Popup::AnyMessage(head, text); +} - FinishPopup(modified, "proxy", text, "", []); +/** + * Create comment for changed file + * @param modul YaST2 module changing the file + * @return comment + * @example ChangedComment("lan") -> # Changed by YaST2 module lan 1.1.2000" + */ +string ChangedComment(string modul) { + string ret = "\n# Changed by YaST2"; + if(modul != nil && modul != "") ret = ret + " module " + modul; + map out = (map)SCR::Execute(.target.bash_output, "/bin/date '+%x'"); + string date = out["stdout"]:""; + if(date != "") ret = ret + " " + date; + return ret; } /** @@ -118,7 +134,8 @@ Progress::New(caption, " ", size(steps), steps, [], ""); - ProgressNextStage(_("Updating proxy configuration...")); + Progress::NextStage(); + Progress::Title(_("Updating proxy configuration...")); /* Update /etc/sysconfig/proxy */ SCR::Write(.sysconfig.proxy.PROXY_ENABLED, enabled?"yes":"no"); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0