June 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r38338 - in /trunk/installation: package/yast2-installation.changes src/clients/inst_worker_continue.ycp src/clients/inst_worker_initial.ycp src/include/inst_inc_all.ycp
by locilka＠svn.opensuse.org 07 Jun '07

07 Jun '07

Author: locilka Date: Thu Jun 7 15:15:47 2007 New Revision: 38338 URL: http://svn.opensuse.org/viewcvs/yast?rev=38338&view=rev Log: - A new label "Writing YaST Configuration..." used in case of restarting system or installation. Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_worker_continue.ycp trunk/installation/src/clients/inst_worker_initial.ycp trunk/installation/src/include/inst_inc_all.ycp Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Thu Jun 7 15:15:47 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jun 7 15:08:08 CEST 2007 - locilka(a)suse.cz + +- A new label "Writing YaST Configuration..." used in case of + restarting system or installation. + +------------------------------------------------------------------- Fri Jun 1 12:41:10 CEST 2007 - mzugec(a)suse.cz - use shared isNetworkRunning() function in network_finish Modified: trunk/installation/src/clients/inst_worker_continue.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_wo… ============================================================================== --- trunk/installation/src/clients/inst_worker_continue.ycp (original) +++ trunk/installation/src/clients/inst_worker_continue.ycp Thu Jun 7 15:15:47 2007 @@ -81,6 +81,9 @@ if (FileUtils::Exists (Installation::restart_data_file)) { string contents = (string) SCR::Read (.target.string, Installation::restart_data_file); + // file will be created if it is needed + y2milestone ("Removing %1 file containing %2", Installation::restart_data_file, contents); + list<string> contents_lines = splitstring (contents, "\n"); integer next_step = tointeger ((string)(contents_lines[0]:nil)); integer restarting_step = tointeger ((string)(contents_lines[1]:nil)); @@ -141,7 +144,7 @@ } // All Sources and Target need to be released... - FinishInstallation(); + FinishInstallation (ret); // Created UI needs to be destroyed UI::CloseDialog(); Modified: trunk/installation/src/clients/inst_worker_initial.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_wo… ============================================================================== --- trunk/installation/src/clients/inst_worker_initial.ycp (original) +++ trunk/installation/src/clients/inst_worker_initial.ycp Thu Jun 7 15:15:47 2007 @@ -87,7 +87,7 @@ } // All Sources and Target need to be released... - FinishInstallation(); + FinishInstallation (ret); // Created UI needs to be destroyed UI::CloseDialog(); Modified: trunk/installation/src/include/inst_inc_all.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/include/inst_in… ============================================================================== --- trunk/installation/src/include/inst_inc_all.ycp (original) +++ trunk/installation/src/include/inst_inc_all.ycp Thu Jun 7 15:15:47 2007 @@ -39,11 +39,18 @@ SetInitializingUI (); } - void FinishInstallation () { + void FinishInstallation (symbol ret) { y2milestone("Finishing the installation..."); - // TRANSLATORS: busy message - UI::OpenDialog (`Label(_("Finishing the installation..."))); // #2 - // disable all sources and finish target + + if (ret == `reboot || ret == `restart_yast || ret == `restart_same_step) { + // TRANSLATORS: busy message + UI::OpenDialog (`Label(_("Finishing the installation..."))); // #2 + } else { + // TRANSLATORS: busy message + UI::OpenDialog (`Label(_("Writing YaST Configuration..."))); // #2 + } + + // disable all sources and finish target Pkg::SourceFinishAll(); // but see also inst_congratulate, #165860 Pkg::TargetFinish(); UI::CloseDialog(); // #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] r38337 - /tags/stable-2_15_11/add-on-creator/
by jsuchome＠svn.opensuse.org 07 Jun '07

07 Jun '07

Author: jsuchome Date: Thu Jun 7 13:19:51 2007 New Revision: 38337 URL: http://svn.opensuse.org/viewcvs/yast?rev=38337&view=rev Log: Created tag stable-2_15_11 for add-on-creator Added: tags/stable-2_15_11/add-on-creator/ - copied from r38336, trunk/add-on-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] r38336 - in /trunk/add-on-creator: VERSION package/yast2-add-on-creator.changes src/AddOnCreator.ycp src/add-on-creator.ycp
by jsuchome＠svn.opensuse.org 07 Jun '07

07 Jun '07

Author: jsuchome Date: Thu Jun 7 13:19:37 2007 New Revision: 38336 URL: http://svn.opensuse.org/viewcvs/yast?rev=38336&view=rev Log: - fix installation of inst-source-utils in CLI mode (#281792) - 2.15.11 Modified: trunk/add-on-creator/VERSION trunk/add-on-creator/package/yast2-add-on-creator.changes trunk/add-on-creator/src/AddOnCreator.ycp trunk/add-on-creator/src/add-on-creator.ycp Modified: trunk/add-on-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/VERSION?rev=38336… ============================================================================== --- trunk/add-on-creator/VERSION (original) +++ trunk/add-on-creator/VERSION Thu Jun 7 13:19:37 2007 @@ -1 +1 @@ -2.15.10 +2.15.11 Modified: trunk/add-on-creator/package/yast2-add-on-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/package/yast2-add… ============================================================================== --- trunk/add-on-creator/package/yast2-add-on-creator.changes (original) +++ trunk/add-on-creator/package/yast2-add-on-creator.changes Thu Jun 7 13:19:37 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jun 7 13:12:31 CEST 2007 - jsuchome(a)suse.cz + +- fix installation of inst-source-utils in CLI mode (#281792) +- 2.15.11 + +------------------------------------------------------------------- Wed May 30 10:09:52 CEST 2007 - jsuchome(a)suse.cz - added support for source rpm's (#279004) Modified: trunk/add-on-creator/src/AddOnCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/src/AddOnCreator.… ============================================================================== --- trunk/add-on-creator/src/AddOnCreator.ycp (original) +++ trunk/add-on-creator/src/AddOnCreator.ycp Thu Jun 7 13:19:37 2007 @@ -39,6 +39,7 @@ import "FileUtils"; import "Mode"; import "Package"; +import "PackageSystem"; import "Popup"; import "Progress"; import "Report"; @@ -692,6 +693,9 @@ */ global boolean Read() { + if (!PackageSystem::CheckAndInstallPackagesInteractive (["inst-source-utils"])) + return false; + gpg_keys = read_secret_keys (); gpg_key = gpg_keys[0]:""; Modified: trunk/add-on-creator/src/add-on-creator.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/src/add-on-creato… ============================================================================== --- trunk/add-on-creator/src/add-on-creator.ycp (original) +++ trunk/add-on-creator/src/add-on-creator.ycp Thu Jun 7 13:19:37 2007 @@ -45,7 +45,6 @@ import "CommandLine"; import "Directory"; import "FileUtils"; -import "PackageSystem"; include "add-on-creator/wizards.ycp"; @@ -470,12 +469,7 @@ ] ]; -any ret = nil; - -if (!PackageSystem::CheckAndInstallPackagesInteractive (["inst-source-utils"])) - ret = `cancel; -else - ret = CommandLine::Run(cmdline_description); +any ret = CommandLine::Run(cmdline_description); /* Finish */ y2milestone("AddOnCreator module 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] r38335 - in /trunk/yast2: library/packages/src/PackageSystem.ycp library/packages/src/common.ycp package/yast2.changes
by lslezak＠svn.opensuse.org 07 Jun '07

07 Jun '07

Author: lslezak Date: Thu Jun 7 12:46:58 2007 New Revision: 38335 URL: http://svn.opensuse.org/viewcvs/yast?rev=38335&view=rev Log: - display licenses in the command line mode properly, fixed prompt when removing packages (#270910) Modified: trunk/yast2/library/packages/src/PackageSystem.ycp trunk/yast2/library/packages/src/common.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/library/packages/src/PackageSystem.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/packages/src/Packa… ============================================================================== --- trunk/yast2/library/packages/src/PackageSystem.ycp (original) +++ trunk/yast2/library/packages/src/PackageSystem.ycp Thu Jun 7 12:46:58 2007 @@ -123,9 +123,27 @@ if (size (licenses) > 0) { list<string> rt_licenses_l = maplist ( string p, string l, licenses, { - return sformat ("%1\n%2", p, l); + return Mode::commandline() + ? sformat ("%1\n%2", p, l) + : sformat ("%1\n%2", p, l); }); - if (! Popup::AnyQuestionRichText ( + + boolean accepted = false; + + if (Mode::commandline()) + { + // print the licenses + CommandLine::Print(mergestring (rt_licenses_l, "\n")); + // print the question + CommandLine::Print(_("Do you accept this license agreement?", + "Do you accept these license agreements?", + size (licenses))); + + accepted = !CommandLine::YesNo(); + } + else + { + accepted = !Popup::AnyQuestionRichText ( // popup heading, with rich text widget and Yes/No buttons _("Do you accept this license agreement?", "Do you accept these license agreements?", @@ -133,19 +151,26 @@ mergestring (rt_licenses_l, "\n"), 70, 20, Label::YesButton (), Label::NoButton (), - `focus_none)) + `focus_none); + } + + y2milestone("Licenses accepted: %1", accepted); + + if (!accepted) { y2milestone("License not accepted: %1", toinstall); last_op_canceled = true; return false; } + + // mark licenses as confirmed foreach (string p, string l, licenses, { Pkg::PkgMarkLicenseConfirmed (p); }); last_op_canceled = false; } - // check if the database os consistent before packages were added + // check if the database is consistent before packages are added boolean packages_consistent = Pkg::PkgSolveCheckTargetOnly(); foreach (string p, toinstall, { Modified: trunk/yast2/library/packages/src/common.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/packages/src/commo… ============================================================================== --- trunk/yast2/library/packages/src/common.ycp (original) +++ trunk/yast2/library/packages/src/common.ycp Thu Jun 7 12:46:58 2007 @@ -106,10 +106,11 @@ return which != nil; } -boolean AskPackages(list<string> packs) { +boolean AskPackages(list<string> packs, boolean install) { string pkgs = mergestring(packs, ", "); // the message is followed by list of required packages - string text = _("These packages need to be installed:") + " " + pkgs; + string text = (install ? _("These packages need to be installed:") : _("These packages need to be removed:")) + + " " + pkgs; CommandLine::Print(text); return CommandLine::YesNo(); @@ -142,7 +143,7 @@ if (message != nil) text = sformat (message, mergestring (packs, ", ")); - boolean doit = (Mode::commandline()) ? (CommandLine::Interactive() ? AskPackages(packs) : true ) : Popup::AnyQuestionRichText( + boolean doit = (Mode::commandline()) ? (CommandLine::Interactive() ? AskPackages(packs, install) : true ) : Popup::AnyQuestionRichText( "", text, 40, 10, Label::ContinueButton (), Label::CancelButton (), `focus_yes 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 Thu Jun 7 12:46:58 2007 @@ -3,6 +3,8 @@ - speed up PackageSystem::InstallKernel() - call rpm directly instead of starting the package manager +- display licenses in the command line mode properly, + fixed prompt when removing packages (#270910) ------------------------------------------------------------------- Tue Jun 5 21:22:50 CEST 2007 - locilka(a)suse.cz -- 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] r38334 - /tags/branch-SLE-10-SP2-2_13_38/samba-client/
by jsuchome＠svn.opensuse.org 07 Jun '07

07 Jun '07

Author: jsuchome Date: Thu Jun 7 10:51:06 2007 New Revision: 38334 URL: http://svn.opensuse.org/viewcvs/yast?rev=38334&view=rev Log: Created tag branch-SLE-10-SP2-2_13_38 for samba-client Added: tags/branch-SLE-10-SP2-2_13_38/samba-client/ - copied from r38333, branches/SuSE-SLE-10-SP2-Branch/samba-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] r38333 - /tags/branch-SLE-10-SP2-2_13_38/
by jsuchome＠svn.opensuse.org 07 Jun '07

07 Jun '07

Author: jsuchome Date: Thu Jun 7 10:51:05 2007 New Revision: 38333 URL: http://svn.opensuse.org/viewcvs/yast?rev=38333&view=rev Log: Created tag branch-SLE-10-SP2-2_13_38 Added: tags/branch-SLE-10-SP2-2_13_38/ -- 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] r38332 - in /branches/SuSE-SLE-10-SP2-Branch/samba-client: VERSION package/yast2-samba-client.changes src/Samba.ycp src/dialogs.ycp
by jsuchome＠svn.opensuse.org 07 Jun '07

07 Jun '07

Author: jsuchome Date: Thu Jun 7 10:50:30 2007 New Revision: 38332 URL: http://svn.opensuse.org/viewcvs/yast?rev=38332&view=rev Log: - do not offer disabling DHCP changes of hostname when it is already disabled (#169260) - 2.13.38 Modified: branches/SuSE-SLE-10-SP2-Branch/samba-client/VERSION branches/SuSE-SLE-10-SP2-Branch/samba-client/package/yast2-samba-client.changes branches/SuSE-SLE-10-SP2-Branch/samba-client/src/Samba.ycp branches/SuSE-SLE-10-SP2-Branch/samba-client/src/dialogs.ycp Modified: branches/SuSE-SLE-10-SP2-Branch/samba-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/samba-… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/samba-client/VERSION (original) +++ branches/SuSE-SLE-10-SP2-Branch/samba-client/VERSION Thu Jun 7 10:50:30 2007 @@ -1 +1 @@ -2.13.37 +2.13.38 Modified: branches/SuSE-SLE-10-SP2-Branch/samba-client/package/yast2-samba-client.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/samba-… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/samba-client/package/yast2-samba-client.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/samba-client/package/yast2-samba-client.changes Thu Jun 7 10:50:30 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Jun 7 10:26:06 CEST 2007 - jsuchome(a)suse.cz + +- do not offer disabling DHCP changes of hostname when + it is already disabled (#169260) +- 2.13.38 + +------------------------------------------------------------------- Thu Jun 7 09:10:03 CEST 2007 - jsuchome(a)suse.cz - removed Browse button (#240045) Modified: branches/SuSE-SLE-10-SP2-Branch/samba-client/src/Samba.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/samba-… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/samba-client/src/Samba.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/samba-client/src/Samba.ycp Thu Jun 7 10:50:30 2007 @@ -118,6 +118,9 @@ ], ]; +// network configuration (to be read from NetworkConfig module) +global map network_setup = $[]; + /** * Return list of architecture specific packages (derived from package list * given as parameter) merged with the packages in parameter @@ -454,6 +457,10 @@ Autologin::Read(); + // read network settings (for bug 169260: do not allow DHCP to change the hostname) + NetworkConfig::Read (); + network_setup = NetworkConfig::Export (); + // finished Progress::NextStage(); globals_configured = true; @@ -513,11 +520,14 @@ // write progress step steps = add (steps, _("Writing Kerberos configuration...")); } - // hack for bug 169260: do not allow DHCP to change the hostname + // bug 169260: do not allow DHCP to change the hostname if (winbind_enabled && disable_dhcp_hostname) { - NetworkConfig::Read (); - map network_setup = NetworkConfig::Export (); + if (network_setup == $[]) + { + NetworkConfig::Read (); + network_setup = NetworkConfig::Export (); + } network_setup["dhcp","DHCLIENT_SET_HOSTNAME"] = "no"; NetworkConfig::Import (network_setup); NetworkConfig::Write (); Modified: branches/SuSE-SLE-10-SP2-Branch/samba-client/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/samba-… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/samba-client/src/dialogs.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/samba-client/src/dialogs.ycp Thu Jun 7 10:50:30 2007 @@ -378,7 +378,9 @@ Autologin::AskForDisabling(_("Samba is now enabled.")); } } - if (Mode::config () || (Stage::cont() && Samba::in_domain == `ok)) + if (Mode::config () || + (Stage::cont() && Samba::in_domain == `ok && + Samba::network_setup["dhcp","DHCLIENT_SET_HOSTNAME"]:"yes" == "yes")) { // yes/no popup text Samba::disable_dhcp_hostname = Popup::YesNo (_("In a Microsoft environment, -- 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] r38331 - in /trunk/yast2: library/packages/src/PackageSystem.ycp package/yast2.changes
by lslezak＠svn.opensuse.org 07 Jun '07

07 Jun '07

Author: lslezak Date: Thu Jun 7 10:26:24 2007 New Revision: 38331 URL: http://svn.opensuse.org/viewcvs/yast?rev=38331&view=rev Log: - speed up PackageSystem::InstallKernel() - call rpm directly instead of starting the package manager Modified: trunk/yast2/library/packages/src/PackageSystem.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/library/packages/src/PackageSystem.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/packages/src/Packa… ============================================================================== --- trunk/yast2/library/packages/src/PackageSystem.ycp (original) +++ trunk/yast2/library/packages/src/PackageSystem.ycp Thu Jun 7 10:26:24 2007 @@ -322,6 +322,32 @@ return true; // nothing to do } + // check whether tag "kernel" is provided + // do not initialize the package manager if it's not necessary + string rpm_command = "/bin/rpm -q --whatprovides kernel"; + y2milestone("Starting RPM query: %1", rpm_command); + map output = (map)SCR::Execute(.target.bash_output, rpm_command); + y2debug("result of the query: %1", output); + + if (output["exit"]:-1 == 0) + { + list<string> packages = splitstring(output["stdout"]:"", "\n"); + packages = filter(string pkg, packages, {return pkg != "";}); + y2milestone("Packages providing tag 'kernel': %1", packages); + + if (size(packages) > 0) + { + return true; + } + + y2milestone("Huh? Kernel is not installed??"); + } + else + { + y2warning("RPM query failed, quering the package manager..."); + } + + EnsureTargetInit (); list <list> provides = Pkg::PkgQueryProvides ("kernel"); 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 Thu Jun 7 10:26:24 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jun 7 10:14:06 CEST 2007 - lslezak(a)suse.cz + +- speed up PackageSystem::InstallKernel() - call rpm directly + instead of starting the package manager + +------------------------------------------------------------------- Tue Jun 5 21:22:50 CEST 2007 - locilka(a)suse.cz - Extended PackageLock::Check function to allow to 'Retry' getting -- 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] r38330 - in /trunk/kdump/src: Kdump.ycp dialogs.ycp uifunctions.ycp
by juhliarik＠svn.opensuse.org 07 Jun '07

07 Jun '07

Author: juhliarik Date: Thu Jun 7 10:16:53 2007 New Revision: 38330 URL: http://svn.opensuse.org/viewcvs/yast?rev=38330&view=rev Log: added init function for inicialization KDUMP_SAVEDIR Modified: trunk/kdump/src/Kdump.ycp trunk/kdump/src/dialogs.ycp trunk/kdump/src/uifunctions.ycp Modified: trunk/kdump/src/Kdump.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/src/Kdump.ycp?rev=38330&r1… ============================================================================== --- trunk/kdump/src/Kdump.ycp (original) +++ trunk/kdump/src/Kdump.ycp Thu Jun 7 10:16:53 2007 @@ -248,6 +248,11 @@ */ boolean ReadAvailableMemory () { + + //list <any> fero = ["stano" , 45]; + //y2milestone("[kdump] (ReadAvailableMemory) before fero: %1", fero); + //add(fero, nil); + //y2milestone("[kdump] (ReadAvailableMemory) after fero: %1", fero); list <map> output = (list<map>)SCR::Read(.probe.memory); y2milestone("[kdump] (ReadAvailableMemory) SCR::Read(.probe.memory): %1", output); Modified: trunk/kdump/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/src/dialogs.ycp?rev=38330&… ============================================================================== --- trunk/kdump/src/dialogs.ycp (original) +++ trunk/kdump/src/dialogs.ycp Thu Jun 7 10:16:53 2007 @@ -233,7 +233,7 @@ `Left(`Label(`id("usable_memory"),"0123456789")), `HStretch () )), - `Left(`IntField(`id("memory_buffer"), `opt(`notify), _("Kdump Memor&y [MB]"),128,4096,128)) + `Left(`IntField(`id("memory_buffer"), `opt(`notify), _("Kdump Memor&y [MB]"),128,1048576,128)) )), "init" : InitKdumpMemory, "handle" : HandleKdumpMemory, Modified: trunk/kdump/src/uifunctions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/src/uifunctions.ycp?rev=38… ============================================================================== --- trunk/kdump/src/uifunctions.ycp (original) +++ trunk/kdump/src/uifunctions.ycp Thu Jun 7 10:16:53 2007 @@ -39,6 +39,22 @@ boolean set_kdump_append = false; +/** + * map of values for "KDUMP_SAVEDIR" + * + * local map <string, string > + */ +map <string, string > KDUMP_SAVE_TARGET = $[ + "target" : "file", // ftp, ssh, nfs, cifs + "server" : "", + "dir" : "", + "user_name" : "", // anonymous + "port" : "", // deafults ftp: 21 ssh:22 + "share" : "", + "password" : "", +]; + + term local_filesystem = `VBox( `Frame(_("Local Filesystem"),`HBox(`HSpacing(1),`VBox( `Left(`ComboBox(`id("local_partitions"), "&The list of available paritions of all disks with filesystem")), @@ -68,11 +84,15 @@ term ftp = `VBox( `Frame(_("FTP"),`HBox(`HSpacing(1),`VBox( - `Left(`TextEntry(`id ("server"), _("Server Nam&e"))), + `Left(`HBox( + `Left(`TextEntry(`id ("server"), _("Server Nam&e"))), + `Left(`TextEntry(`id ("port"), _("P&ort"))), + `HStretch () + )), `Left(`TextEntry( `id("dir"), _("&Directory on Server"))), `Left(`CheckBox(`id ("anonymous"), `opt (`notify),_("&Anonymous"))), // text entry - `Left(`TextEntry(`id ("username"), _("&User Name"))), + `Left(`TextEntry(`id ("user_name"), _("&User Name"))), // password entry `Left(`Password(`id ("password"), _("&Password"))) ))) @@ -88,9 +108,7 @@ )), `Left(`TextEntry( `id("dir"), _("&Directory on Server"))), // text entry - `Left(`TextEntry(`id ("username"), _("&User Name"))), - // password entry - `Left(`Password(`id ("password"), _("&Password"))) + `Left(`TextEntry(`id ("user_name"), _("&User Name"))) ))) ); @@ -113,7 +131,7 @@ `Left(`TextEntry(`id ("share"), _("Sha&re"))), `Left(`TextEntry( `id("dir"), _("&Directory on Server"))), // text entry - `Left(`TextEntry(`id ("username"), _("&User Name"))), + `Left(`TextEntry(`id ("user_name"), _("&User Name"))), // password entry `Left(`Password(`id ("password"), _("&Password"))) ))) @@ -146,6 +164,88 @@ } +/** + * Function for handling map values + * + * local map <string, string > KDUMP_SAVE_TARGET + */ + +boolean SetUpKDUMP_SAVE_TARGET(string target) { + + string parse_target = target; + if (target != "") { + integer pos = find(parse_target, "/"); + integer pos1 = -1; + KDUMP_SAVE_TARGET["target"]=substring(parse_target,0,pos-1); + parse_target = substring(parse_target,pos+2); + if (KDUMP_SAVE_TARGET["target"]:nil == "file") { + KDUMP_SAVE_TARGET["dir"]=parse_target; + } else if (KDUMP_SAVE_TARGET["target"]:nil == "nfs") { + pos = find(parse_target, ":"); + pos1 = pos; + KDUMP_SAVE_TARGET["server"]=substring(parse_target,0,pos); + pos = find(parse_target, "/"); + KDUMP_SAVE_TARGET["share"]=substring(parse_target,pos1+1,pos-(pos1+1)); + KDUMP_SAVE_TARGET["dir"]=substring(parse_target,pos); + } else if (KDUMP_SAVE_TARGET["target"]:nil == "ssh") { + pos = find(parse_target, "@"); + if (pos != -1) { + KDUMP_SAVE_TARGET["user_name"]=substring(parse_target,0,pos); + parse_target = substring(parse_target,pos+1); + } + pos1 = find(parse_target, ":"); + pos = find(parse_target, "/"); + if (pos1 !=-1) { + KDUMP_SAVE_TARGET["server"]=substring(parse_target,0,pos1); + KDUMP_SAVE_TARGET["port"]=substring(parse_target,pos1+1,pos-(pos1+1)); + } else { + KDUMP_SAVE_TARGET["server"]=substring(parse_target,0,pos); + } + KDUMP_SAVE_TARGET["dir"]=substring(parse_target,pos); + } else if ((KDUMP_SAVE_TARGET["target"]:nil == "ftp") + || (KDUMP_SAVE_TARGET["target"]:nil == "cifs")) { + + pos = find(parse_target, "@"); + if (pos != -1) { + string user_pas = substring(parse_target,0,pos); + pos1 = find(user_pas, ":"); + if (pos1 != -1) { + KDUMP_SAVE_TARGET["user_name"]=substring(parse_target,0,pos1); + KDUMP_SAVE_TARGET["password"]=substring(parse_target,pos1+1,pos); + } else { + KDUMP_SAVE_TARGET["user_name"]=substring(parse_target,0,pos); + } + parse_target = substring(parse_target,pos+1); + } + if (KDUMP_SAVE_TARGET["target"]:nil == "ftp") { + pos1 = find(parse_target, ":"); + pos = find(parse_target, "/"); + if (pos1 !=-1) { + KDUMP_SAVE_TARGET["server"]=substring(parse_target,0,pos1); + KDUMP_SAVE_TARGET["port"]=substring(parse_target,pos1+1,pos-(pos1+1)); + } else { + KDUMP_SAVE_TARGET["server"]=substring(parse_target,0,pos); + } + KDUMP_SAVE_TARGET["dir"]=substring(parse_target,pos); + } else { + pos = find(parse_target, "/"); + KDUMP_SAVE_TARGET["server"]=substring(parse_target,0,pos); + parse_target = substring(parse_target,pos+1); + pos = find(parse_target, "/"); + KDUMP_SAVE_TARGET["share"]=substring(parse_target,0,pos); + KDUMP_SAVE_TARGET["dir"]=substring(parse_target,pos); + } + + } + + + return true; + } else { + return false; + } + +} + /** * Function initializes option "Kdump Command Line" @@ -153,10 +253,68 @@ */ void InitTargetKdump (string key) { - UI::ReplaceWidget (`id ("Network"), `Empty()); - UI::ReplaceWidget (`id ("Targets"), local_filesystem); - UI::ChangeWidget(`id("local_partitions"), `Items, Kdump::available_partitions); - y2milestone("[kdump] (InitTargetKdump) Kdump::available_partitions %1", Kdump::available_partitions); + + SetUpKDUMP_SAVE_TARGET(Kdump::KDUMP_SETTINGS["KDUMP_SAVEDIR"]:nil); + //Popup::Message(Kdump::KDUMP_SETTINGS["KDUMP_SAVEDIR"]:nil); + //Popup::Message(KDUMP_SAVE_TARGET["target"]:nil); + if (KDUMP_SAVE_TARGET["target"]:nil == "file") { + UI::ChangeWidget(`id ("local_filesystem"), `Value, true); + UI::ReplaceWidget (`id ("Network"), `Empty()); + UI::ReplaceWidget (`id ("Targets"), local_filesystem); + UI::ChangeWidget(`id("local_partitions"), `Items, Kdump::available_partitions); + y2milestone("[kdump] (InitTargetKdump) Kdump::available_partitions %1", Kdump::available_partitions); + UI::ChangeWidget(`id ("dir_save_image"), `Value, KDUMP_SAVE_TARGET["dir"]:nil); + } else if (KDUMP_SAVE_TARGET["target"]:nil == "nfs") { + UI::ChangeWidget(`id ("network"), `Value, true); + UI::ReplaceWidget (`id ("Targets"), `Empty()); + UI::ReplaceWidget (`id ("Network"), network); + UI::ReplaceWidget (`id ("Targets"), nfs); + UI::ChangeWidget(`id ("nfs"), `Value, true); + UI::ChangeWidget(`id ("server"), `Value, KDUMP_SAVE_TARGET["server"]:nil); + UI::ChangeWidget(`id ("share"), `Value, KDUMP_SAVE_TARGET["share"]:nil); + UI::ChangeWidget(`id ("dir"), `Value, KDUMP_SAVE_TARGET["dir"]:nil); + } else if (KDUMP_SAVE_TARGET["target"]:nil == "ssh") { + UI::ChangeWidget(`id ("network"), `Value, true); + UI::ReplaceWidget (`id ("Targets"), `Empty()); + UI::ReplaceWidget (`id ("Network"), network); + UI::ReplaceWidget (`id ("Targets"), ssh); + UI::ChangeWidget(`id ("ssh"), `Value, true); + UI::ChangeWidget(`id ("server"), `Value, KDUMP_SAVE_TARGET["server"]:nil); + UI::ChangeWidget(`id ("port"), `Value, KDUMP_SAVE_TARGET["port"]:nil); + UI::ChangeWidget(`id ("user_name"), `Value, KDUMP_SAVE_TARGET["user_name"]:nil); + UI::ChangeWidget(`id ("dir"), `Value, KDUMP_SAVE_TARGET["dir"]:nil); + } else if (KDUMP_SAVE_TARGET["target"]:nil == "ftp") { + UI::ChangeWidget(`id ("network"), `Value, true); + UI::ReplaceWidget (`id ("Targets"), `Empty()); + UI::ReplaceWidget (`id ("Network"), network); + UI::ReplaceWidget (`id ("Targets"), ftp); + UI::ChangeWidget(`id ("ftp"), `Value, true); + UI::ChangeWidget(`id ("server"), `Value, KDUMP_SAVE_TARGET["server"]:nil); + UI::ChangeWidget(`id ("port"), `Value, KDUMP_SAVE_TARGET["port"]:nil); + UI::ChangeWidget(`id ("dir"), `Value, KDUMP_SAVE_TARGET["dir"]:nil); + if (KDUMP_SAVE_TARGET["user_name"]:nil == "") { + UI::ChangeWidget(`id ("user_name"), `Enabled, false); + UI::ChangeWidget(`id ("password"), `Enabled, false); + UI::ChangeWidget(`id ("anonymous"), `Value, true); + } else { + UI::ChangeWidget(`id ("user_name"), `Value, KDUMP_SAVE_TARGET["user_name"]:nil); + UI::ChangeWidget(`id ("password"), `Value, KDUMP_SAVE_TARGET["password"]:nil); + } + } else if (KDUMP_SAVE_TARGET["target"]:nil == "cifs") { + UI::ChangeWidget(`id ("network"), `Value, true); + UI::ReplaceWidget (`id ("Targets"), `Empty()); + UI::ReplaceWidget (`id ("Network"), network); + UI::ReplaceWidget (`id ("Targets"), smb); + UI::ChangeWidget(`id ("smb"), `Value, true); + UI::ChangeWidget(`id ("server"), `Value, KDUMP_SAVE_TARGET["server"]:nil); + UI::ChangeWidget(`id ("dir"), `Value, KDUMP_SAVE_TARGET["dir"]:nil); + UI::ChangeWidget(`id ("share"), `Value, KDUMP_SAVE_TARGET["share"]:nil); + UI::ChangeWidget(`id ("user_name"), `Value, KDUMP_SAVE_TARGET["user_name"]:nil); + UI::ChangeWidget(`id ("password"), `Value, KDUMP_SAVE_TARGET["password"]:nil); + + } + + } /** -- 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] r38329 - /tags/branch-SLE-10-SP2-2_13_37/samba-client/
by jsuchome＠svn.opensuse.org 07 Jun '07

07 Jun '07

Author: jsuchome Date: Thu Jun 7 09:29:20 2007 New Revision: 38329 URL: http://svn.opensuse.org/viewcvs/yast?rev=38329&view=rev Log: Created tag branch-SLE-10-SP2-2_13_37 for samba-client Added: tags/branch-SLE-10-SP2-2_13_37/samba-client/ - copied from r38328, branches/SuSE-SLE-10-SP2-Branch/samba-client/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0