March 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r45834 - /trunk/installation/src/modules/ImageInstallation.ycp
by locilka＠svn.opensuse.org 28 Mar '08

28 Mar '08

Author: locilka Date: Fri Mar 28 14:29:58 2008 New Revision: 45834 URL: http://svn.opensuse.org/viewcvs/yast?rev=45834&view=rev Log: Er, ehm... Modified: trunk/installation/src/modules/ImageInstallation.ycp Modified: trunk/installation/src/modules/ImageInstallation.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/modules/ImageIn… ============================================================================== --- trunk/installation/src/modules/ImageInstallation.ycp (original) +++ trunk/installation/src/modules/ImageInstallation.ycp Fri Mar 28 14:29:58 2008 @@ -145,7 +145,7 @@ y2milestone ("Calling: %1", cmd); out = (map)SCR::Execute (.target.bash_output, cmd); - y2milestone ("Returned %2", out); + y2milestone ("Returned %1", out); return out["exit"]:-1 == 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] r45833 - in /trunk/installation: package/yast2-installation.changes src/modules/ImageInstallation.ycp
by locilka＠svn.opensuse.org 28 Mar '08

28 Mar '08

Author: locilka Date: Fri Mar 28 14:14:48 2008 New Revision: 45833 URL: http://svn.opensuse.org/viewcvs/yast?rev=45833&view=rev Log: - ImageInstallation can newly handle .lzma images. Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/modules/ImageInstallation.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 Fri Mar 28 14:14:48 2008 @@ -4,6 +4,7 @@ - Automatic configuration has been moved from the end of the first stage to the second stage. It's non-interactive (FATE #303396). - Fixed installation from images (FATE #303554). +- ImageInstallation can newly handle .lzma images. - 2.16.27 ------------------------------------------------------------------- Modified: trunk/installation/src/modules/ImageInstallation.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/modules/ImageIn… ============================================================================== --- trunk/installation/src/modules/ImageInstallation.ycp (original) +++ trunk/installation/src/modules/ImageInstallation.ycp Fri Mar 28 14:14:48 2008 @@ -20,6 +20,7 @@ import "XML"; import "Progress"; import "Report"; +import "String"; textdomain "installation"; @@ -131,10 +132,21 @@ y2milestone ("Executing %1 returned %2", cmd, out); y2milestone ("Untarring the image"); - // FIXME: Progress `tar --checkpoint` - cmd = sformat ("tar --totals -xf %1 -C %2", image, target); + + // TODO: Progress `tar --checkpoint` + + // lzma + if (regexpmatch (image, "\.lzma$")) { + cmd = sformat ("lzmadec < '%1' | tar --totals -C '%2' -xf -", String::Quote (image), String::Quote (target)); + // bzip2, gzip + } else { + cmd = sformat ("tar --totals -xf '%1' -C -xf '%2'", String::Quote (image), String::Quote (target)); + } + y2milestone ("Calling: %1", cmd); + out = (map)SCR::Execute (.target.bash_output, cmd); - y2milestone ("Executing %1 returned %2", cmd, out); + y2milestone ("Returned %2", out); + return out["exit"]:-1 == 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] r45832 - in /trunk/pkg-bindings: package/yast2-pkg-bindings.changes src/Resolvable_Properties.cc
by lslezak＠svn.opensuse.org 28 Mar '08

28 Mar '08

Author: lslezak Date: Fri Mar 28 14:10:30 2008 New Revision: 45832 URL: http://svn.opensuse.org/viewcvs/yast?rev=45832&view=rev Log: - Pkg:ResolvableProperties() - added "transact_by" key for selected packages Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes trunk/pkg-bindings/src/Resolvable_Properties.cc Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/package/yast2-pkg-b… ============================================================================== --- trunk/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ trunk/pkg-bindings/package/yast2-pkg-bindings.changes Fri Mar 28 14:10:30 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Mar 28 14:09:18 CET 2008 - lslezak(a)suse.cz + +- Pkg:ResolvableProperties() - added "transact_by" key for selected + packages + +------------------------------------------------------------------- Thu Mar 27 11:30:03 CET 2008 - lslezak(a)suse.cz - added priority support - implemented Pkg::SourceLowerPriority(), Modified: trunk/pkg-bindings/src/Resolvable_Properties.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Resolvable_Prop… ============================================================================== --- trunk/pkg-bindings/src/Resolvable_Properties.cc (original) +++ trunk/pkg-bindings/src/Resolvable_Properties.cc Fri Mar 28 14:10:30 2008 @@ -57,6 +57,8 @@ status is `installed, `removed, `selected or `available, source is source ID or -1 if the resolvable is installed in the target if status is `available and locked is true then the object is set to taboo, if status is `installed and locked is true then the object locked + if status is `selected or `removed there is extra key "transact_by" : symbol, where symbol is `user (the highest level), + `app_high (selected by Yast), `app_low and `solver (the lowest level) */ YCPValue @@ -78,6 +80,21 @@ return ResolvablePropertiesEx (name, kind_r, version, true); } +std::string TransactToString(zypp::ResStatus::TransactByValue trans) +{ + std::string ret; + + switch(trans) + { + case zypp::ResStatus::USER : ret = "user"; break; + case zypp::ResStatus::APPL_HIGH : ret = "app_high"; break; + case zypp::ResStatus::APPL_LOW : ret = "app_low"; break; + case zypp::ResStatus::SOLVER : ret = "solver"; break; + } + + return ret; +} + YCPValue PkgFunctions::ResolvablePropertiesEx(const YCPString& name, const YCPSymbol& kind_r, const YCPString& version, bool dependencies) { @@ -99,6 +116,7 @@ else if ( req_kind == "pattern" ) { kind = zypp::ResTraits<zypp::Pattern>::kind; } +# warning add language support else { y2error("Pkg::ResolvableProperties: unknown symbol: %s", req_kind.c_str()); @@ -132,11 +150,20 @@ if (it->status().isInstalled()) { - stat = (it->status().isToBeUninstalled()) ? "removed" : "installed"; + if (it->status().isToBeUninstalled()) + { + stat = "removed"; + info->add(YCPString("transact_by"), YCPSymbol(TransactToString(it->status().getTransactByValue()))); + } + else + { + stat = "installed"; + } } else if (it->status().isToBeInstalled()) { stat = "selected"; + info->add(YCPString("transact_by"), YCPSymbol(TransactToString(it->status().getTransactByValue()))); } else { @@ -344,6 +371,7 @@ else if ( req_kind == "pattern" ) { kind = zypp::ResTraits<zypp::Pattern>::kind; } +# warning add language support else if ( req_kind == "any" ) { try { -- 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] r45831 - in /trunk/installation: control/ package/ src/clients/ src/include/ src/modules/
by locilka＠svn.opensuse.org 28 Mar '08

28 Mar '08

Author: locilka Date: Fri Mar 28 13:37:20 2008 New Revision: 45831 URL: http://svn.opensuse.org/viewcvs/yast?rev=45831&view=rev Log: - Automatic configuration has been moved from the end of the first stage to the second stage. It's non-interactive (FATE #303396). - Fixed installation from images (FATE #303554). - 2.16.27 Modified: trunk/installation/control/control.openSUSE.xml trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/automatic_configuration_finish.ycp trunk/installation/src/clients/inst_automatic_configuration.ycp trunk/installation/src/clients/inst_deploy_image.ycp trunk/installation/src/clients/inst_finish.ycp trunk/installation/src/clients/inst_prepare_image.ycp trunk/installation/src/clients/inst_software_selection.ycp trunk/installation/src/include/inst_inc_first.ycp trunk/installation/src/include/misc.ycp trunk/installation/src/modules/ImageInstallation.ycp Modified: trunk/installation/control/control.openSUSE.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.ope… ============================================================================== --- trunk/installation/control/control.openSUSE.xml (original) +++ trunk/installation/control/control.openSUSE.xml Fri Mar 28 13:37:20 2008 @@ -634,6 +634,17 @@ <heading>yes</heading> <label>Configuration</label> </module> +  + <module> + <label>Automatic Configuration</label> + <name>automatic_configuration</name> + <enable_back>no</enable_back> + <enable_next>no</enable_next> + </module> <module> <label>root Password</label> <name>root</name> 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 Fri Mar 28 13:37:20 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Mar 28 13:33:31 CET 2008 - locilka(a)suse.cz + +- Automatic configuration has been moved from the end of the first + stage to the second stage. It's non-interactive (FATE #303396). +- Fixed installation from images (FATE #303554). +- 2.16.27 + +------------------------------------------------------------------- Thu Mar 27 13:37:02 CET 2008 - locilka(a)suse.cz - Fixed ZMD service handling, the correct name is novell-zmd Modified: trunk/installation/src/clients/automatic_configuration_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/automat… ============================================================================== --- trunk/installation/src/clients/automatic_configuration_finish.ycp (original) +++ trunk/installation/src/clients/automatic_configuration_finish.ycp Fri Mar 28 13:37:20 2008 @@ -1,7 +1,8 @@ /** * File: clients/automatic_configuration_finish.ycp * Package: installation - * Summary: Automatic configuration instead of the second stage (Preview) + * Summary: Automatic configuration instead of the second stage. + * DO NOT USE THIS CLIENT ANYMORE. * Authors: Lukas Ocilka <locilka(a)suse.cz> * ThanksTo: Martin Vidner <mvidner(a)suse.cz> * Ladislav Slezak <lslezak(a)suse.cz> @@ -19,6 +20,9 @@ textdomain "installation"; + y2error ("DO NOT USE THIS CLIENT ANYMORE!"); + return `auto; + any ret = nil; string func = ""; map param = $[]; Modified: trunk/installation/src/clients/inst_automatic_configuration.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_au… ============================================================================== --- trunk/installation/src/clients/inst_automatic_configuration.ycp (original) +++ trunk/installation/src/clients/inst_automatic_configuration.ycp Fri Mar 28 13:37:20 2008 @@ -1,7 +1,7 @@ /** * File: clients/inst_automatic_configuration.ycp * Package: installation - * Summary: Automatic configuration instead of the second stage (Preview) + * Summary: Automatic configuration instead of the second stage * Authors: Lukas Ocilka <locilka(a)suse.cz> * * $Id:$ @@ -17,27 +17,34 @@ textdomain "installation"; + if (GetInstArgs::going_back()) { + y2milestone ("Going back, nothing to do here..."); + return `auto; + } + y2milestone ("automatic_configuration started"); Mode::SetMode ("installation"); Stage::Set ("continue"); +// TODO: read this from control file +// (at least the list of modules in proposals) list <map <string, any> > proposal_scripts_to_call = [ // probably needed - $[ "type":"scripts", "items":["netprobe"] ], + $[ "type":"scripts", "items":["initialization", "netprobe", "rpmcopy_secondstage"] ], // network proposal $[ "type":"proposals", "items":["lan", "general", "dsl", "isdn", "modem", "remote", "firewall"] ], // hardware proposal $[ "type":"proposals", "items":["x11", "printer", "sound", "tv"] ], // probably needed - $[ "type":"scripts", "items":["suseconfig", "save_hardware_status"] ], + $[ "type":"scripts", "items":["addon_update_sources", "inst_extrasources", "suseconfig", "save_hardware_status"] ], ]; - // weird exception for users - if (FileUtils::Exists (Directory::vardir + "/users_first_stage.ycp")) { - y2milestone ("Users will be called"); - proposal_scripts_to_call = add (proposal_scripts_to_call, $[ "type":"scripts", "items":["user"] ]); - } +// users will be called if there is anything to write +// if (FileUtils::Exists (Directory::vardir + "/users_first_stage.ycp")) { +// y2milestone ("Users will be called"); +// proposal_scripts_to_call = add (proposal_scripts_to_call, $[ "type":"scripts", "items":["user"] ]); +// } /** * Prepares the list of installation scripts to be executed. @@ -101,13 +108,20 @@ foreach (string one_proposal, proposals_to_call, { y2milestone ("Calling script %1 MakeProposal", one_proposal); - any result = WFM::CallFunction (one_proposal, ["MakeProposal", $[ "WriteOnly":true, "AutomaticConfiguration":true ]]); + any result = WFM::CallFunction (one_proposal, ["MakeProposal", $[ "AutomaticConfiguration":true ]]); y2milestone ("Script %1 returned %2", one_proposal, result); }); + // TODO: handle errors, warnings ... + // foreach (string one_proposal, proposals_to_call, { + // y2milestone ("Calling script %1 MakeProposal", one_proposal); + // any result = WFM::CallFunction (one_proposal, ["Description", $[ "AutomaticConfiguration":true ]]); + // y2milestone ("Script %1 returned %2", one_proposal, result); + //}); + foreach (string one_proposal, proposals_to_call, { y2milestone ("Calling script %1 Write", one_proposal); - any result = WFM::CallFunction (one_proposal, ["Write", $[ "WriteOnly":true, "AutomaticConfiguration":true ]]); + any result = WFM::CallFunction (one_proposal, ["Write", $[ "AutomaticConfiguration":true ]]); y2milestone ("Script %1 returned %2", one_proposal, result); }); } @@ -127,4 +141,6 @@ }); y2milestone ("automatic_configuration finished"); + + return `auto; } Modified: trunk/installation/src/clients/inst_deploy_image.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_de… ============================================================================== --- trunk/installation/src/clients/inst_deploy_image.ycp (original) +++ trunk/installation/src/clients/inst_deploy_image.ycp Fri Mar 28 13:37:20 2008 @@ -30,7 +30,7 @@ { last_image = image; if (image < size (images)) - Progress::Title (sformat (_("Deploying Image \"%1\""), images[image]:"")); + Progress::Title (sformat (_("Deploying Image (%1/%2)..."), (image + 1), size (images))); } Progress::Step (image); } @@ -38,31 +38,30 @@ Wizard::SetContents (_("Deploying Installation Images"), `Empty (), "", false, false); Wizard::SetTitleIcon ("yast-inst-mode"); -// FIXME: help (if needed) -Progress::Simple (_("Deploying Installation Images"), _("Deploying Installation Images"), size (images), "help"); - ImageInstallation::StoreAllChanges(); Pkg::TargetFinish (); -/* -// FIXME the images usually do not fit in RAMDISK +// TODO: help (if needed) +Progress::Simple (_("Deploying Installation Images"), _("Deploying Installation Images"), size (images), "help"); + +// Images usually do not fit into RAMDISK // move download area to hard disk (for HTTP/FTP media) // TODO select according to partitioning -string download_dir = "/img_tmp"; -download_dir = Installation::destdir + download_dir; +string download_dir = Installation::destdir + "/img_tmp"; SCR::Execute (.target.bash, sformat ("test -d %1 || mkdir -p %1", download_dir)); Pkg::SourceMoveDownloadArea (download_dir); -// don't know why it didn't work :-( -*/ ImageInstallation::DeployImages (images, Installation::destdir, SetProgress); -//SCR::Execute (.target.bash, sformat ("rmdir %1", download_dir)); +SCR::Execute (.target.bash, sformat ("rmdir '%1'", download_dir)); y2milestone ("Target image for package selector prepared"); +Progress::Finish(); + Pkg::TargetInitialize (Installation::destdir); +Pkg::TargetLoad (); ImageInstallation::RestoreAllChanges(); Modified: trunk/installation/src/clients/inst_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_fi… ============================================================================== --- trunk/installation/src/clients/inst_finish.ycp (original) +++ trunk/installation/src/clients/inst_finish.ycp Fri Mar 28 13:37:20 2008 @@ -100,8 +100,6 @@ // copy logs just before 'umount' // keeps maximum logs available after reboot "copy_logs", - // runs a separate process in SCR (chrooted) - "automatic_configuration", "umount", ], ], Modified: trunk/installation/src/clients/inst_prepare_image.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_pr… ============================================================================== --- trunk/installation/src/clients/inst_prepare_image.ycp (original) +++ trunk/installation/src/clients/inst_prepare_image.ycp Fri Mar 28 13:37:20 2008 @@ -31,7 +31,7 @@ list <string> patterns_to_install = maplist (map <string, any> one_patern, all_patterns, { if (one_patern["status"]:`unknown == `selected || one_patern["status"]:`unknown == `installed) { - return one_patern["status"]:""; + return one_patern["name"]:""; } else { return ""; } @@ -43,7 +43,13 @@ // list images for currently selected patterns y2milestone ("Currently selected patterns: %1", patterns_to_install); -ImageInstallation::FindImageSet (patterns_to_install); -return `next; +// avoid useles calls +if (size (patterns_to_install) > 0) { + ImageInstallation::FindImageSet (patterns_to_install); +} + +y2milestone ("Images for installation ready"); + +return `auto; } Modified: trunk/installation/src/clients/inst_software_selection.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_so… ============================================================================== --- trunk/installation/src/clients/inst_software_selection.ycp (original) +++ trunk/installation/src/clients/inst_software_selection.ycp Fri Mar 28 13:37:20 2008 @@ -115,7 +115,8 @@ term contents = `HBox ( `HStretch(), `HSquash ( - `MinWidth (38, `VBox ( + `VBox ( + `HSpacing (50), `VWeight (5, `VStretch()), // TRANSLATORS: Label (of a Radio button group) `Left (`Label (`opt(`boldFont), _("Select a System Type"))), @@ -128,13 +129,13 @@ `VSpacing (1), `VSquash (`Frame ( _("Description"), - `MinHeight (5, `RichText ( + `MinHeight (7, `RichText ( `id ("desktop_description"), "" )) )), `VWeight (5, `VStretch()) - )) + ) ), `HStretch() ); Modified: trunk/installation/src/include/inst_inc_first.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/include/inst_in… ============================================================================== --- trunk/installation/src/include/inst_inc_first.ycp (original) +++ trunk/installation/src/include/inst_inc_first.ycp Fri Mar 28 13:37:20 2008 @@ -41,7 +41,10 @@ } ProductControl::DisableModule ("add-on"); - ProductControl::DisableModule ("productsources"); + ProductControl::DisableModule ("productsources"); + + // Enabled only when AC is selected + ProductControl::DisableModule ("automatic_configuration"); // First-stage users module will enable them again only if needed ProductControl::DisableModule ("root"); Modified: trunk/installation/src/include/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/include/misc.yc… ============================================================================== --- trunk/installation/src/include/misc.ycp (original) +++ trunk/installation/src/include/misc.ycp Fri Mar 28 13:37:20 2008 @@ -211,8 +211,10 @@ void AdjustStepsAccordingToInstallationSettings () { if (ProductControl::GetUseAutomaticConfiguration()) { ProductControl::DisableAllModulesAndProposals ("installation", "continue"); + ProductControl::EnableModule ("automatic_configuration"); } else { ProductControl::UnDisableAllModulesAndProposals ("installation", "continue"); + ProductControl::DisableModule ("automatic_configuration"); } if (Installation::add_on_selected == true) { Modified: trunk/installation/src/modules/ImageInstallation.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/modules/ImageIn… ============================================================================== --- trunk/installation/src/modules/ImageInstallation.ycp (original) +++ trunk/installation/src/modules/ImageInstallation.ycp Fri Mar 28 13:37:20 2008 @@ -96,14 +96,15 @@ /** * Add information about new image - * @param id string the id of the image + * @param name string the name/id of the image * @param file string the file name of the image * @param type string the type of the image, one of "tar" and "fs" */ -void AddImage (string id, string file, string type) { - _images[id] = $[ +void AddImage (string name, string file, string type) { + _images[file] = $[ "file" : file, "type" : type, + "name" : name, ]; } @@ -130,7 +131,8 @@ y2milestone ("Executing %1 returned %2", cmd, out); y2milestone ("Untarring the image"); - cmd = sformat ("tar -xf %1 -C %2", image, target); + // FIXME: Progress `tar --checkpoint` + cmd = sformat ("tar --totals -xf %1 -C %2", image, target); out = (map)SCR::Execute (.target.bash_output, cmd); y2milestone ("Executing %1 returned %2", cmd, out); return out["exit"]:-1 == 0; @@ -175,7 +177,7 @@ y2milestone ("Executing %1 returned %2", cmd, out); y2milestone ("Unmounting image from temporary directory"); - cmd = sformat ("umount %1", tmpdir); + cmd = sformat ("umount -d -f -l %1", tmpdir); out = (map)SCR::Execute (.target.bash_output, cmd); y2milestone ("Executing %1 returned %2", cmd, out); return out["exit"]:-1 == 0; @@ -223,16 +225,18 @@ { y2error ("Image %1 does not exist", id); } + string type = img["type"]:""; + if (type == "fs") return temporary ? MountFsImage (id, target) : DeployFsImage (id, target); else if (type == "tar") return DeployTarImage (id, target); + y2error ("Unknown type of image: %1", type); return false; - } /** @@ -242,7 +246,7 @@ * @return boolean true on success */ global boolean DeployImage (string id, string target) { - y2milestone ("Delploying image %1 to %2", id, target); + y2milestone ("Deploying image %1 to %2", id, target); return _DeployImage (id, target, false); } @@ -284,6 +288,7 @@ */ global boolean DeployImages (list<string> images, string target, void(integer,integer) progress) { integer num = -1; + foreach (string img, images, { num = num + 1; progress (num, 0); @@ -291,8 +296,6 @@ }); progress (num, 100); - Pkg::TargetInitialize (target); - Pkg::TargetLoad (); return true; // TODO error checking } @@ -316,6 +319,7 @@ y2milestone ("Image list for installation not found"); return true; } + map<string,any> image_descr = XML::XMLToYCPFile (filename); if (image_descr == nil) { @@ -324,16 +328,21 @@ Report::Error (_("Failed to read information about installation images")); return false; } + list<map<string,any> > image_sets = image_descr["image_sets"]:[]; y2milestone ("Image set descriptions: %1", image_sets); map<string,any> result = $[]; + foreach (map<string,any> image, image_sets, { string pattern = image["pattern"]:""; - if (pattern == "" && result == $[]) + + if (pattern == "" && result == $[]) { result = image; - else if (contains (patterns, pattern)) + } else if (contains (patterns, pattern)) { result = image; + } }); + if (result == $[]) { Installation::image_installation = false; @@ -341,20 +350,33 @@ y2milestone ("No image for installation found"); return true; } + Installation::image_installation = true; - if (haskey (result, "pkg_image")) + + if (haskey (result, "pkg_image")) { _metadata_image = result["pkg_image"]:""; - else + } else { Installation::image_only= true; + } + foreach (map<string,string> img, result["images"]:[], { - _image_order = add (_image_order, img["name"]:""); + // image must have unique <name>...</name> defined + if (img["file"]:"" == "") { + y2error ("No file defined for %1", img); + return; + } + + _image_order = add (_image_order, img["file"]:""); AddImage (img["name"]:"", img["file"]:"", img["type"]:""); }); + y2milestone ("Image-only installation: %1", Installation::image_only); y2milestone ("Images: %1", _images); y2milestone ("Image installation order: %1", _image_order); + if (! Installation::image_only) y2milestone ("Image with software management metadata: %1", _metadata_image); + return true; } @@ -450,7 +472,9 @@ /** * List of all handled types. */ - list <symbol> all_supported_types = [`product, `pattern, `selection, `language, `package, `patch]; + // list <symbol> all_supported_types = [`product, `pattern, `selection, `language, `package, `patch]; + // Zypp currently counts [ `product, `pattern, `selection, `language ] + list <symbol> all_supported_types = [`package, `patch]; /** * Map that stores all the requested states of all handled/supported types. @@ -538,7 +562,8 @@ ret = false; // They are not installed } else { - y2milestone ("Installing type: %1, details: %2,%3,%4", one_type, one_object["name"]:"", one_object["arch"]:"", one_object["version"]:""); + y2milestone ("Installing type: %1, details: %2,%3,%4", + one_type, one_object["name"]:"", one_object["arch"]:"", one_object["version"]:""); // Confirm we want to install them (they might have been added as dependencies) Pkg::ResolvableInstallArchVersion (one_object["name"]:"", one_type, one_object["arch"]:"", one_object["version"]:""); // should be installed @@ -564,37 +589,45 @@ list <map <string, any> > to_install = filter (map <string, any> one_resolvable, resolvable_properties, { return (one_resolvable["status"]:`unknown == `selected); }); - Progress::NextStep(); - foreach (map <string, any> one_to_install, to_install, { - ProceedWithSelected (one_to_install, one_type); - }); - Progress::NextStep(); + Progress::NextStep(); // All packages selected to be installed // [ $[ "arch" : ... , "name" : ... , "version" : ... ], ... ] - list <map <string, any> > selected_for_installation = maplist (map one_resolvable, objects_state[one_type, "install"]:[], { + list <map <string, string> > selected_for_installation = maplist (map one_resolvable, objects_state[one_type, "install"]:[], { return $[ "arch":one_resolvable["arch"]:"", "name":one_resolvable["name"]:"", "version":one_resolvable["version"]:"" ]; }); + Progress::NextStep(); - map <string, string> one_installed_resolvable = $[]; + // Delete all packages that are installed but should not be + map <string, string> one_already_installed_resolvable = $[]; foreach (map <string, any> one_resolvable, resolvable_properties, { // We are interested in the already installed resolvables only - if (one_resolvable["status"]:`unknown != `installed) + if (one_resolvable["status"]:`unknown != `installed && one_resolvable["status"]:`unknown != `selected) { return; + } - one_installed_resolvable = $[ + one_already_installed_resolvable = $[ "arch":one_resolvable["arch"]:"", "name":one_resolvable["name"]:"", "version":one_resolvable["version"]:"" ]; // Already installed resolvable but not in list of resolvables to be installed - if (! contains (selected_for_installation, one_installed_resolvable)) { - y2milestone ("Removing type: %1, name: %2", one_type, one_resolvable["name"]:"-x-"); + if (! contains (selected_for_installation, one_already_installed_resolvable)) { + y2milestone ("Removing type: %1, name: %2 version: %3", + one_type, one_resolvable["name"]:"-x-", one_resolvable["version"]:"-x-"); Pkg::ResolvableRemove (one_resolvable["name"]:"-x-", one_type); } }); + Progress::NextStep(); + + // Install all packages that aren't yet + foreach (map <string, any> one_to_install, to_install, { + ProceedWithSelected (one_to_install, one_type); + }); + + Progress::NextStep(); }); Progress::Finish(); -- 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] r45830 - /trunk/network/src/remote/dialogs.ycp
by kmachalkova＠svn.opensuse.org 28 Mar '08

28 Mar '08

Author: kmachalkova Date: Fri Mar 28 13:21:11 2008 New Revision: 45830 URL: http://svn.opensuse.org/viewcvs/yast?rev=45830&view=rev Log: Exit the module on closing GUI window (clicking on [x]) (#372321) Modified: trunk/network/src/remote/dialogs.ycp Modified: trunk/network/src/remote/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/remote/dialogs.ycp?r… ============================================================================== --- trunk/network/src/remote/dialogs.ycp (original) +++ trunk/network/src/remote/dialogs.ycp Fri Mar 28 13:21:11 2008 @@ -100,6 +100,10 @@ { Wizard::ShowHelp(help); } + else if(ret == `cancel) + { + break; + } } until( ret == `next || ret == `back ); -- 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] r45829 - in /trunk/sound: package/yast2-sound.changes sound/config/sound.rnc
by ug＠svn.opensuse.org 28 Mar '08

28 Mar '08

Author: ug Date: Fri Mar 28 13:03:16 2008 New Revision: 45829 URL: http://svn.opensuse.org/viewcvs/yast?rev=45829&view=rev Log: autoyast rnc file fixed Modified: trunk/sound/package/yast2-sound.changes trunk/sound/sound/config/sound.rnc Modified: trunk/sound/package/yast2-sound.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/package/yast2-sound.change… ============================================================================== --- trunk/sound/package/yast2-sound.changes (original) +++ trunk/sound/package/yast2-sound.changes Fri Mar 28 13:03:16 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Mar 28 13:01:02 CET 2008 - ug(a)suse.de + +- autoyast rnc file fixed + +------------------------------------------------------------------- Mon Mar 17 16:03:29 CET 2008 - lslezak(a)suse.cz - unified button labels (use "OK" instead of "Accept") Modified: trunk/sound/sound/config/sound.rnc URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/sound/config/sound.rnc?rev… ============================================================================== --- trunk/sound/sound/config/sound.rnc (original) +++ trunk/sound/sound/config/sound.rnc Fri Mar 28 13:03:16 2008 @@ -43,10 +43,12 @@ } volume_entry = element volume_entry { + LIST, Anything* } volume_settings = element volume_settings { + LIST, volume_entry* } configure_detected = -- 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] r45828 - /tags/stable-2_16_3/samba-client/
by jsuchome＠svn.opensuse.org 28 Mar '08

28 Mar '08

Author: jsuchome Date: Fri Mar 28 12:59:00 2008 New Revision: 45828 URL: http://svn.opensuse.org/viewcvs/yast?rev=45828&view=rev Log: Created tag stable-2_16_3 for samba-client Added: tags/stable-2_16_3/samba-client/ - copied from r45827, trunk/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] r45827 - in /trunk/samba-client: VERSION package/yast2-samba-client.changes src/Samba.ycp src/SambaConfig.pm src/complex.ycp
by jsuchome＠svn.opensuse.org 28 Mar '08

28 Mar '08

Author: jsuchome Date: Fri Mar 28 12:58:54 2008 New Revision: 45827 URL: http://svn.opensuse.org/viewcvs/yast?rev=45827&view=rev Log: - do not check for required packages during Read (bnc#374703) - SambaConfig: do not create the hash by referencing inside - 2.16.3 Modified: trunk/samba-client/VERSION trunk/samba-client/package/yast2-samba-client.changes trunk/samba-client/src/Samba.ycp trunk/samba-client/src/SambaConfig.pm trunk/samba-client/src/complex.ycp Modified: trunk/samba-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/VERSION?rev=45827&r… ============================================================================== --- trunk/samba-client/VERSION (original) +++ trunk/samba-client/VERSION Fri Mar 28 12:58:54 2008 @@ -1 +1 @@ -2.16.2 +2.16.3 Modified: trunk/samba-client/package/yast2-samba-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/package/yast2-samba… ============================================================================== --- trunk/samba-client/package/yast2-samba-client.changes (original) +++ trunk/samba-client/package/yast2-samba-client.changes Fri Mar 28 12:58:54 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Mar 28 12:52:34 CET 2008 - jsuchome(a)suse.cz + +- do not check for required packages during Read (bnc#374703) +- SambaConfig: do not create the hash by referencing inside +- 2.16.3 + +------------------------------------------------------------------- Mon Mar 17 12:43:32 CET 2008 - jsrain(a)suse.cz - added 'StartupNotify=true' to the desktop file (bnc #304964) Modified: trunk/samba-client/src/Samba.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/src/Samba.ycp?rev=4… ============================================================================== --- trunk/samba-client/src/Samba.ycp (original) +++ trunk/samba-client/src/Samba.ycp Fri Mar 28 12:58:54 2008 @@ -21,7 +21,6 @@ import "NetworkConfig"; import "Mode"; import "Package"; -import "PackageSystem"; import "Pam"; import "Progress"; import "Report"; @@ -243,7 +242,7 @@ global define boolean ReadSharesSetting () { shares_dir = SambaConfig::GlobalGetStr ("usershare path", shares_dir); - if (FileUtils::Exists (shares_dir)) + if (shares_dir != nil && FileUtils::Exists (shares_dir)) { map stat = (map) SCR::Read (.target.stat, shares_dir); map out = (map) SCR::Execute (.target.bash_output, sformat ("getent group | grep \":%1:\" | /usr/bin/cut -f 1 -d :", stat["gid"]:100)); @@ -425,14 +424,6 @@ // read global settings Progress::NextStage(); - // check installed packages - if (!PackageSystem::CheckAndInstallPackagesInteractive( - UpdatedArchPackages (["samba-client"]))) - { - y2warning("package samba-client not installed"); - return false; - } - SambaConfig::Read(false); // read winbind status Modified: trunk/samba-client/src/SambaConfig.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/src/SambaConfig.pm?… ============================================================================== --- trunk/samba-client/src/SambaConfig.pm (original) +++ trunk/samba-client/src/SambaConfig.pm Fri Mar 28 12:58:54 2008 @@ -23,8 +23,10 @@ textdomain "samba-client"; our %TYPEINFO; -YaST::YCP::Import("SCR"); +YaST::YCP::Import("FileUtils"); YaST::YCP::Import("Mode"); +YaST::YCP::Import("SCR"); +YaST::YCP::Import("PackageSystem"); ########################################################################### @@ -159,6 +161,11 @@ sub Read { my ($self, $forceReRead) = @_; + if (!PackageSystem->Installed("samba-client")) { + y2error("package samba-client not installed"); + return 0; + } + # configuraton already read return 1 if not $forceReRead and %Config; @@ -202,7 +209,10 @@ %WinbindConfig = (); # read the complete global section - $AllAtOnce = SCR->Read(".etc.security_winbind.all"); + $AllAtOnce = {}; + if (FileUtils->Exists ("/etc/security/winbind.conf")) { + $AllAtOnce = SCR->Read(".etc.security_winbind.all"); + } # convert .ini agent all-at-once map to %WinbindConfig foreach my $section (@{$AllAtOnce->{value}}) { @@ -318,7 +328,7 @@ # commit the changes if (!SCR->Write(".etc.security_winbind", undef)) { - y2error("Cannot write settings to /etc/samba/smb.conf"); + y2error("Cannot write settings to /etc/security/winbind.conf"); return 0; } return 1; @@ -553,7 +563,7 @@ $val = toboolean($val); return defined $val ? ($val ? "No" : "Yes") : $default; } - if (defined $Config{$share}{$key}) { + if (defined $Config{$share} && $Config{$share}{$key}) { if (ref $Config{$share}{$key} eq "ARRAY") { return $Config{$share}{$key}[0]; } @@ -586,7 +596,7 @@ return [$val]; } } - if (defined $Config{$share}{$key}) { + if (defined $Config{$share} && $Config{$share}{$key}) { if (ref $Config{$share}{$key} eq "ARRAY") { return $Config{$share}{$key}; } @@ -1031,7 +1041,8 @@ } $key = lc($key); $key = $Synonyms{$key} if exists $Synonyms{$key}; - if (defined $WinbindConfig{$share}{$key}) { + if (defined $WinbindConfig{$share} && defined $WinbindConfig{$share}{$key}) + { if (ref $WinbindConfig{$share}{$key} eq "ARRAY") { return $WinbindConfig{$share}{$key}[0]; } Modified: trunk/samba-client/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/src/complex.ycp?rev… ============================================================================== --- trunk/samba-client/src/complex.ycp (original) +++ trunk/samba-client/src/complex.ycp Fri Mar 28 12:58:54 2008 @@ -11,9 +11,10 @@ textdomain "samba-client"; +import "PackageSystem"; +import "Samba"; import "Wizard"; -import "Samba"; include "samba-client/helps.ycp"; include "samba-client/routines.ycp"; @@ -32,6 +33,15 @@ */ symbol ReadDialog() { Wizard::RestoreHelp(HELPS["read"]:""); + + // check installed packages + if (!PackageSystem::CheckAndInstallPackagesInteractive( + Samba::UpdatedArchPackages (["samba-client"]))) + { + y2warning("package samba-client not installed"); + return `abort; + } + boolean ret = Samba::Read(); return ret ? `next : `abort; } -- 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] r45826 - /tags/stable-2_16_0/firewall/
by ug＠svn.opensuse.org 28 Mar '08

28 Mar '08

Author: ug Date: Fri Mar 28 12:42:06 2008 New Revision: 45826 URL: http://svn.opensuse.org/viewcvs/yast?rev=45826&view=rev Log: Created tag stable-2_16_0 for firewall Added: tags/stable-2_16_0/firewall/ - copied from r45825, trunk/firewall/ -- 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] r45825 - in /trunk/firewall: VERSION config/firewall.rnc package/yast2-firewall.changes
by ug＠svn.opensuse.org 28 Mar '08

28 Mar '08

Author: ug Date: Fri Mar 28 12:42:01 2008 New Revision: 45825 URL: http://svn.opensuse.org/viewcvs/yast?rev=45825&view=rev Log: rnc file fixed. 2.16.0 Modified: trunk/firewall/VERSION trunk/firewall/config/firewall.rnc trunk/firewall/package/yast2-firewall.changes Modified: trunk/firewall/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/firewall/VERSION?rev=45825&r1=45… ============================================================================== --- trunk/firewall/VERSION (original) +++ trunk/firewall/VERSION Fri Mar 28 12:42:01 2008 @@ -1 +1 @@ -2.15.8 +2.16.0 Modified: trunk/firewall/config/firewall.rnc URL: http://svn.opensuse.org/viewcvs/yast/trunk/firewall/config/firewall.rnc?rev… ============================================================================== --- trunk/firewall/config/firewall.rnc (original) +++ trunk/firewall/config/firewall.rnc Fri Mar 28 12:42:01 2008 @@ -48,6 +48,7 @@ | FW_CONFIGURATIONS_EXT | FW_CONFIGURATIONS_INT | FW_LOAD_MODULES + | FW_ALLOW_PING_FW firewall = element firewall { y2_firewall* } FW_CONFIGURATIONS_DMZ = element FW_CONFIGURATIONS_DMZ { text } @@ -96,3 +97,4 @@ FW_SERVICES_INT_RPC = element FW_SERVICES_INT_RPC { text } FW_SERVICES_INT_TCP = element FW_SERVICES_INT_TCP { text } FW_SERVICES_INT_UDP = element FW_SERVICES_INT_UDP { text } +FW_ALLOW_PING_FW = element FW_ALLOW_PING_FW { text } Modified: trunk/firewall/package/yast2-firewall.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/firewall/package/yast2-firewall.… ============================================================================== --- trunk/firewall/package/yast2-firewall.changes (original) +++ trunk/firewall/package/yast2-firewall.changes Fri Mar 28 12:42:01 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Mar 28 12:22:32 CET 2008 - ug(a)suse.de + +- rnc file fixed +- 2.16.0 + +------------------------------------------------------------------- Mon Mar 17 12:43:32 CET 2008 - jsrain(a)suse.cz - added 'StartupNotify=true' to the desktop file (bnc #304964) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0