September 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r40727 - /tags/stable-2_15_74/
by locilka＠svn.opensuse.org 03 Sep '07

03 Sep '07

Author: locilka Date: Mon Sep 3 16:49:51 2007 New Revision: 40727 URL: http://svn.opensuse.org/viewcvs/yast?rev=40727&view=rev Log: Created tag stable-2_15_74 Added: tags/stable-2_15_74/ -- 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] r40726 - /tags/stable-2_15_5/printer/
by mzugec＠svn.opensuse.org 03 Sep '07

03 Sep '07

Author: mzugec Date: Mon Sep 3 16:48:49 2007 New Revision: 40726 URL: http://svn.opensuse.org/viewcvs/yast?rev=40726&view=rev Log: Created tag stable-2_15_5 for printer Added: tags/stable-2_15_5/printer/ - copied from r40725, trunk/printer/ -- 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] r40725 - in /trunk/printer: VERSION package/yast2-printer.changes src/modules/Printer.ycp
by mzugec＠svn.opensuse.org 03 Sep '07

03 Sep '07

Author: mzugec Date: Mon Sep 3 16:48:32 2007 New Revision: 40725 URL: http://svn.opensuse.org/viewcvs/yast?rev=40725&view=rev Log: read URI for usb printers from cups backend if not available in hwinfo (#307118) Modified: trunk/printer/VERSION trunk/printer/package/yast2-printer.changes trunk/printer/src/modules/Printer.ycp Modified: trunk/printer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/VERSION?rev=40725&r1=407… ============================================================================== --- trunk/printer/VERSION (original) +++ trunk/printer/VERSION Mon Sep 3 16:48:32 2007 @@ -1 +1 @@ -2.15.4 +2.15.5 Modified: trunk/printer/package/yast2-printer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/package/yast2-printer.ch… ============================================================================== --- trunk/printer/package/yast2-printer.changes (original) +++ trunk/printer/package/yast2-printer.changes Mon Sep 3 16:48:32 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Sep 3 16:47:22 CEST 2007 - mzugec(a)suse.cz + +- read URI for usb printers from cups backend if not available +in hwinfo (#307118) +- 2.15.5 + +------------------------------------------------------------------- Mon Aug 6 10:00:35 CEST 2007 - mzugec(a)suse.cz - reverted factory patch (remove tabs) Modified: trunk/printer/src/modules/Printer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/modules/Printer.ycp?… ============================================================================== --- trunk/printer/src/modules/Printer.ycp (original) +++ trunk/printer/src/modules/Printer.ycp Mon Sep 3 16:48:32 2007 @@ -349,12 +349,13 @@ if (Spooler::Get () == "cups") { - dev_name - = Printerlib::GetCupsUsbDeviceInfo (class_dev)[0]:""; - if (dev_name == nil || dev_name == "") - { - dev_name = class_dev; - } + dev_name = Printerlib::GetCupsUsbDeviceInfo (class_dev)[0]:""; + if ((dev_name == nil || dev_name == "")||(class_dev == nil || class_dev == "")){ + dev_name = Printerlib::GetCupsUsbDevicesInfo()[0,0]:""; + } + else { + dev_name = class_dev; + } } p = $[ "vendor" : i["sub_vendor"]:i["vendor"]:"", -- 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] r40724 - in /trunk/packager: package/yast2-packager.changes src/modules/AddOnProduct.ycp
by locilka＠svn.opensuse.org 03 Sep '07

03 Sep '07

Author: locilka Date: Mon Sep 3 16:43:14 2007 New Revision: 40724 URL: http://svn.opensuse.org/viewcvs/yast?rev=40724&view=rev Log: - Correctly evaluating relurl:// parameters, such as relurl://.../?device=sda5 (#306670). - 2.15.74 Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/AddOnProduct.ycp Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Mon Sep 3 16:43:14 2007 @@ -1,10 +1,16 @@ ------------------------------------------------------------------- +Mon Sep 3 16:41:26 CEST 2007 - locilka(a)suse.cz + +- Correctly evaluating relurl:// parameters, such as + relurl://.../?device=sda5 (#306670). +- 2.15.74 + +------------------------------------------------------------------- Mon Sep 3 16:36:13 CEST 2007 - lslezak(a)suse.cz - use gif animation for the busy indicator (works also in Gtk UI) (#296945), do not restart the animation too often (wait at least 3 seconds) -- 2.15.74 ------------------------------------------------------------------- Mon Sep 3 14:07:53 CEST 2007 - lslezak(a)suse.cz Modified: trunk/packager/src/modules/AddOnProduct.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/AddOnProduc… ============================================================================== --- trunk/packager/src/modules/AddOnProduct.ycp (original) +++ trunk/packager/src/modules/AddOnProduct.ycp Mon Sep 3 16:43:14 2007 @@ -105,6 +105,47 @@ } /** + * Reads list of HTTP params and returns them as map + * + * @params string params + * @return map <string, string> params + * + * @example + * MakeMapFromParams ("device=sda3&login=aaa&password=bbb") -> $[ + * "device" : "sda3", + * "login" : "aaa", + * "password" : "bbb" + * ] + */ +map <string, string> MakeMapFromParams (string params) { + list <string> params_list = splitstring (params, "&"); + + params_list = filter (string one_param, params_list, { + return (one_param != "" && one_param != nil); + }); + + map <string, string> ret = $[]; + integer eq_pos = nil; + string opt = ""; + string val = ""; + + foreach (string one_param, params_list, { + eq_pos = search (one_param, "="); + + if (eq_pos == nil) { + ret[one_param] = ""; + } else { + opt = substring (one_param, 0, eq_pos); + val = substring (one_param, (eq_pos + 1)); + + ret[opt] = val; + } + }); + + return ret; +} + +/** * Returns an absolute URL from base + relative url. * Relative URL needs to start with 'reulrl://' othewise * it is not considered being relative and it's returned @@ -135,11 +176,28 @@ return url; } + // bugzilla #306670 + integer base_params_pos = search (base_url, "?"); + string base_params = ""; + + if (base_params_pos != nil && base_params_pos >= 0) { + base_params = substring (base_url, (base_params_pos + 1)); + base_url = substring (base_url, 0, base_params_pos); + } + + integer added_params_pos = search (url, "?"); + string added_params = ""; + + if (added_params_pos != nil && added_params_pos >= 0) { + added_params = substring (url, (added_params_pos + 1)); + url = substring (url, 0, added_params_pos); + } + if (! regexpmatch (base_url, "/$")) { base_url = base_url + "/"; } - y2milestone ("Merging '%1' to '%2'", url, base_url); + y2milestone ("Merging '%1' (params '%2') to '%3' (params '%4')", url, added_params, base_url, base_params); url = regexpsub (url, "^relurl://(.*)$", "\\1"); url = sformat ("%1%2", base_url, url); @@ -173,6 +231,29 @@ url = regexpsub (url, "^(.*)/\\./(.*)", "\\1/\\2"); } + map <string, string> base_params_map = MakeMapFromParams (base_params); + map <string, string> added_params_map = MakeMapFromParams (added_params); + map <string, string> final_params_map = (map <string, string>) union (base_params_map, added_params_map); + + if (size (final_params_map) > 0) { + y2milestone ("%1 merge %2 -> %3", base_params_map, added_params_map, final_params_map); + + string url_add = ""; + + foreach (string opt, string val, final_params_map, { + url_add = + url_add + + // add '&' if needed + (size (url_add) > 0 ? "&" : "") + + opt + + // define 'opt=val' if val is set + // otherwise don't use '=val' at all + (size (val) > 0 ? "=" + val : ""); + }); + + url = url + "?" + url_add; + } + y2milestone ("Final URL: '%1'", url); return url; } -- 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] r40723 - /trunk/ntp-client/src/dialogs.ycp
by kmachalkova＠svn.opensuse.org 03 Sep '07

03 Sep '07

Author: kmachalkova Date: Mon Sep 3 16:41:34 2007 New Revision: 40723 URL: http://svn.opensuse.org/viewcvs/yast?rev=40723&view=rev Log: Replace Finish button with Accept in installation proposal Modified: trunk/ntp-client/src/dialogs.ycp Modified: trunk/ntp-client/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/src/dialogs.ycp?rev=4… ============================================================================== --- trunk/ntp-client/src/dialogs.ycp (original) +++ trunk/ntp-client/src/dialogs.ycp Mon Sep 3 16:41:34 2007 @@ -123,7 +123,8 @@ string help = CWM::MergeHelps (w); contents = CWM::PrepareDialog (contents, w); Wizard::SetContentsButtons (caption, contents, help, - Label::BackButton (), Label::FinishButton ()); + Label::BackButton (), + Stage::initial()? Label::AcceptButton() : Label::FinishButton ()); Wizard::HideBackButton(); Wizard::SetAbortButton(`abort, Label::CancelButton() ); @@ -213,7 +214,8 @@ string help = CWM::MergeHelps (w); contents = CWM::PrepareDialog (contents, w); Wizard::SetContentsButtons (caption, contents, help, - Label::BackButton (), Label::FinishButton ()); + Label::BackButton (), + Stage::initial()? Label::AcceptButton() : Label::FinishButton ()); Wizard::HideBackButton(); Wizard::SetAbortButton(`abort, Label::CancelButton() ); -- 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] r40722 - in /trunk/packager: VERSION package/yast2-packager.changes src/modules/PackageCallbacks.ycp
by lslezak＠svn.opensuse.org 03 Sep '07

03 Sep '07

Author: lslezak Date: Mon Sep 3 16:40:27 2007 New Revision: 40722 URL: http://svn.opensuse.org/viewcvs/yast?rev=40722&view=rev Log: - use gif animation for the busy indicator (works also in Gtk UI) (#296945), do not restart the animation too often (wait at least 3 seconds) - 2.15.74 Modified: trunk/packager/VERSION trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/PackageCallbacks.ycp Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=40722&r1=40… ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Mon Sep 3 16:40:27 2007 @@ -1 +1 @@ -2.15.73 +2.15.74 Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Mon Sep 3 16:40:27 2007 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Mon Sep 3 16:36:13 CEST 2007 - lslezak(a)suse.cz + +- use gif animation for the busy indicator (works also in Gtk UI) + (#296945), do not restart the animation too often (wait at least + 3 seconds) +- 2.15.74 + +------------------------------------------------------------------- Mon Sep 3 14:07:53 CEST 2007 - lslezak(a)suse.cz - better busy indicator for tick callback (#296945) Modified: trunk/packager/src/modules/PackageCallbacks.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/PackageCall… ============================================================================== --- trunk/packager/src/modules/PackageCallbacks.ycp (original) +++ trunk/packager/src/modules/PackageCallbacks.ycp Mon Sep 3 16:40:27 2007 @@ -32,7 +32,7 @@ global boolean _package_popup = false; global boolean _script_popup = false; global boolean _scan_popup = false; - global string _tick_movie = "/usr/share/YaST2/theme/current/animations/ticks-loop3.mng"; + global string _tick_movie = "/usr/share/YaST2/theme/current/animations/ticks-loop3.gif"; global integer _tick_movie_x = 7; global integer _tick_movie_y = 1; global string _package_name = ""; @@ -57,6 +57,8 @@ // max. length of the text in the repository popup window integer max_size = 60; + integer tick_time = 0; + //-------------------------------------------------------------------------- // defaults @@ -2117,6 +2119,7 @@ ) ); + tick_time = 0; } } @@ -2164,7 +2167,20 @@ progressw = `Label(label); } - UI::ReplaceWidget (`id(`rp_progress), progressw ); + // restart the animation only when at least 3 seconds elapsed, + // don't restart it too often + integer tm = time(); + y2debug("Time elapsed since the last tick callback: %1", tm - tick_time); + if (tm - tick_time > 3) + { + UI::ReplaceWidget (`id(`rp_progress), progressw ); + tick_time = tm; + } + else + { + y2debug("Ignoring the tick callback"); + } + if (tick_progress) { -- 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] r40721 - /trunk/ntp-client/src/NtpClient.ycp
by kmachalkova＠svn.opensuse.org 03 Sep '07

03 Sep '07

Author: kmachalkova Date: Mon Sep 3 16:28:22 2007 New Revision: 40721 URL: http://svn.opensuse.org/viewcvs/yast?rev=40721&view=rev Log: er, syntax error Modified: trunk/ntp-client/src/NtpClient.ycp Modified: trunk/ntp-client/src/NtpClient.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/src/NtpClient.ycp?rev… ============================================================================== --- trunk/ntp-client/src/NtpClient.ycp (original) +++ trunk/ntp-client/src/NtpClient.ycp Mon Sep 3 16:28:22 2007 @@ -967,6 +967,7 @@ //Do not do anything to ntp service during installation if ( !Stage::initial() ) + { //Start the service if it was running if ( status == 0); Service::Start (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] r40720 - in /trunk/ntp-client/src: NtpClient.ycp ntp-client_proposal.ycp
by kmachalkova＠svn.opensuse.org 03 Sep '07

03 Sep '07

Author: kmachalkova Date: Mon Sep 3 16:15:57 2007 New Revision: 40720 URL: http://svn.opensuse.org/viewcvs/yast?rev=40720&view=rev Log: Do not query status/stop/start NTP service during installation (holds for NTP test and ntp proposal client) Modified: trunk/ntp-client/src/NtpClient.ycp trunk/ntp-client/src/ntp-client_proposal.ycp Modified: trunk/ntp-client/src/NtpClient.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/src/NtpClient.ycp?rev… ============================================================================== --- trunk/ntp-client/src/NtpClient.ycp (original) +++ trunk/ntp-client/src/NtpClient.ycp Mon Sep 3 16:15:57 2007 @@ -25,6 +25,7 @@ import "Report"; import "Service"; import "SLPAPI"; +import "Stage"; import "String"; import "Summary"; import "SuSEFirewall"; @@ -939,9 +940,16 @@ `Left(`Label(_("Testing the NTP server..."))) ); - integer status = Service::Status (service_name); - if (status == 0) - Service::Stop (service_name); + integer status = -1; + //Do not do anything to ntp service during installation + if ( !Stage::initial() ) + { + status = Service::Status (service_name); + //Stop service temporarily (otherwise ntpdate won't work) + //0 means service is running + if ( status == 0); + Service::Stop (service_name); + } y2milestone ("Testing reachability of server %1", server); // testing the server using IPv4 and then using IPv6 protocol @@ -956,8 +964,13 @@ "/usr/sbin/ntpdate -6 -q %1", server )); - if (status == 0) - Service::Start (service_name); + + //Do not do anything to ntp service during installation + if ( !Stage::initial() ) + //Start the service if it was running + if ( status == 0); + Service::Start (service_name); + } UI::CloseDialog(); Modified: trunk/ntp-client/src/ntp-client_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/src/ntp-client_propos… ============================================================================== --- trunk/ntp-client/src/ntp-client_proposal.ycp (original) +++ trunk/ntp-client/src/ntp-client_proposal.ycp Mon Sep 3 16:15:57 2007 @@ -132,13 +132,17 @@ { y2milestone("Running ntpdate to sync with %1", ntp_server); - integer status = 0; + integer status = -1; string service_name = "ntp"; //Stop NTP service on running system (during 1st stage, we don't care) - if( !Stage::initial() && status == 0) + if( !Stage::initial()) { - Service::Stop(service_name); + status = Service::Status (service_name); + //Stop service temporarily (otherwise ntpdate won't work) + //0 means service is running + if ( status == 0); + Service::Stop (service_name); } //Schedule package for installation @@ -147,9 +151,10 @@ integer r = (integer) SCR::Execute (.target.bash, sformat ("/usr/sbin/ntpdate '%1'", String::Quote(ntp_server))); y2milestone ("'ntpdate %1' returned %2", ntp_server, r); - if( !Stage::initial() && status == 0) + if( !Stage::initial()) { - Service::Start(service_name); + if( status == 0 ) + Service::Start(service_name); } if (r == 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] r40719 - in /trunk/autoinstallation: VERSION package/autoyast2.changes src/clients/autoyast.ycp
by ug＠svn.opensuse.org 03 Sep '07

03 Sep '07

Author: ug Date: Mon Sep 3 16:07:25 2007 New Revision: 40719 URL: http://svn.opensuse.org/viewcvs/yast?rev=40719&view=rev Log: commandline options fixed (#269887) Modified: trunk/autoinstallation/VERSION trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/clients/autoyast.ycp Modified: trunk/autoinstallation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/VERSION?rev=407… ============================================================================== --- trunk/autoinstallation/VERSION (original) +++ trunk/autoinstallation/VERSION Mon Sep 3 16:07:25 2007 @@ -1 +1 @@ -2.15.14 +2.15.15 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 Mon Sep 3 16:07:25 2007 @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Mon Sep 3 16:07:03 CEST 2007 - ug(a)suse.de + +- commandline options fixed (#269887) + +------------------------------------------------------------------- +Mon Aug 20 17:50:03 CEST 2007 - ug(a)suse.de + +- 2.15.15 + +------------------------------------------------------------------- Mon Aug 20 14:49:22 CEST 2007 - mvidner(a)suse.cz - Require nfs-kernel-server.rpm because nfs-utils.rpm got split (#286300). Modified: trunk/autoinstallation/src/clients/autoyast.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/clients/aut… ============================================================================== --- trunk/autoinstallation/src/clients/autoyast.ycp (original) +++ trunk/autoinstallation/src/clients/autoyast.ycp Mon Sep 3 16:07:25 2007 @@ -71,6 +71,7 @@ map cmdline = $[ "id" : "autoyast2", "help" : _("autoyast"), + "guihandler" : AutoSequence, "actions" : $[ "file" : $[ "handler":openFile, "help":"file operations" ] ], @@ -84,11 +85,8 @@ "file" : ["filename"] ] ]; - if(!CommandLine::Init(cmdline, WFM::Args())) - { - y2error("Commandline init failed"); - return (symbol)AutoSequence (); - } + + // command line options /* Init variables */ string command = ""; @@ -97,25 +95,8 @@ string exit = ""; list l = []; - while(!CommandLine::Done()) - { - map m = CommandLine::Command(); - command = m["command"]:"exit"; - options = m["options"]:$[]; - - if( command == "file" ) { - openFile(options); - } else { - /* maybe we got "exit" or "quit" */ - if( !CommandLine::Done() ) { - CommandLine::Print("Unknown command (should not happen)"); - continue; - } - } - } - + CommandLine::Run(cmdline); - symbol ret = (symbol)AutoSequence (); AddOnProduct::CleanModeConfigSources(); - return ret; + return `exit; } -- 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] r40718 - /trunk/mail/agents/ag_fetchmailrc
by varkoly＠svn.opensuse.org 03 Sep '07

03 Sep '07

Author: varkoly Date: Mon Sep 3 15:57:20 2007 New Revision: 40718 URL: http://svn.opensuse.org/viewcvs/yast?rev=40718&view=rev Log: #304190 - YaST2 warnings, autoyast writes aliases without colon #304707 - yast2 mail gives error Modified: trunk/mail/agents/ag_fetchmailrc Modified: trunk/mail/agents/ag_fetchmailrc URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/agents/ag_fetchmailrc?rev=4… ============================================================================== --- trunk/mail/agents/ag_fetchmailrc (original) +++ trunk/mail/agents/ag_fetchmailrc Mon Sep 3 15:57:20 2007 @@ -162,7 +162,7 @@ # #207305 sub get_fetchmail_user () { - my $user = qx'. /etc/sysconfig/fetchmail; echo ${FETCHMAIL_USER:-fetchmail}'; + my $user = qx'F=/etc/sysconfig/fetchmail; test -f $F && . $F; echo ${FETCHMAIL_USER:-fetchmail}'; chomp $user; return $user; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0