December 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r42709 - in /trunk/product-creator: VERSION package/yast2-product-creator.changes src/Kiwi.ycp src/ProductCreator.ycp src/commandline.ycp src/dialogs.ycp src/kiwi_dialogs.ycp src/product-creator.ycp
by jsuchome＠svn.opensuse.org 05 Dec '07

05 Dec '07

Author: jsuchome Date: Wed Dec 5 13:18:17 2007 New Revision: 42709 URL: http://svn.opensuse.org/viewcvs/yast?rev=42709&view=rev Log: - added command line support (F302395) - fixed generating configuration path name (#346152) - 2.16.6 Modified: trunk/product-creator/VERSION trunk/product-creator/package/yast2-product-creator.changes trunk/product-creator/src/Kiwi.ycp trunk/product-creator/src/ProductCreator.ycp trunk/product-creator/src/commandline.ycp trunk/product-creator/src/dialogs.ycp trunk/product-creator/src/kiwi_dialogs.ycp trunk/product-creator/src/product-creator.ycp Modified: trunk/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/VERSION?rev=4270… ============================================================================== --- trunk/product-creator/VERSION (original) +++ trunk/product-creator/VERSION Wed Dec 5 13:18:17 2007 @@ -1 +1 @@ -2.16.5 +2.16.6 Modified: trunk/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/package/yast2-pr… ============================================================================== --- trunk/product-creator/package/yast2-product-creator.changes (original) +++ trunk/product-creator/package/yast2-product-creator.changes Wed Dec 5 13:18:17 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Dec 5 09:57:45 CET 2007 - jsuchome(a)suse.cz + +- added command line support (F302395) +- fixed generating configuration path name (#346152) +- 2.16.6 + +------------------------------------------------------------------- Mon Dec 3 15:12:11 CET 2007 - jsuchome(a)suse.cz - perl-XML-LibXML required for ag_kiwi Modified: trunk/product-creator/src/Kiwi.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/Kiwi.ycp?rev… ============================================================================== --- trunk/product-creator/src/Kiwi.ycp (original) +++ trunk/product-creator/src/Kiwi.ycp Wed Dec 5 13:18:17 2007 @@ -716,7 +716,7 @@ if (!FileUtils::Exists (images_dir)) SCR::Execute (.target.mkdir, images_dir); SCR::Execute (.target.bash, sformat ("cp -ar %1 %2/", config_dir, images_dir)); - return (images_dir + KiwiConfig["name"]:""); + return (images_dir + "/" + KiwiConfig["name"]:""); } /** Modified: trunk/product-creator/src/ProductCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/ProductCreat… ============================================================================== --- trunk/product-creator/src/ProductCreator.ycp (original) +++ trunk/product-creator/src/ProductCreator.ycp Wed Dec 5 13:18:17 2007 @@ -164,8 +164,13 @@ symbol autoyastPackages () { string base_selection = ""; - //Pkg::TargetFinish (); - Popup::ShowFeedback(_("Reading data from Package Database..."), _("Please wait...")); + // busy message + string feedback = _("Reading data from Package Database..."); + if (Mode::commandline()) + CommandLine::PrintVerbose (feedback); + else + // popup + Popup::ShowFeedback (feedback, _("Please wait...")); Pkg::TargetFinish (); string tmp = (string)SCR::Read( .target.tmpdir ); Modified: trunk/product-creator/src/commandline.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/commandline.… ============================================================================== --- trunk/product-creator/src/commandline.ycp (original) +++ trunk/product-creator/src/commandline.ycp Wed Dec 5 13:18:17 2007 @@ -9,10 +9,12 @@ { import "CommandLine"; + import "FileUtils"; import "Progress"; import "ProductCreator"; - textdomain "product-creator"; + import "RichText"; + textdomain "product-creator"; void ProcessConfigFileOption(map params) { @@ -32,6 +34,135 @@ } } + /** + * Go through the command line parameters map, verify the validity + * and fill appropriate gloal values + * @param params map with command line parameters + * @param action for what action are the parameters intended (create/edit) + */ + boolean ProcessParameters (map params, string action) + { + string name = params["name"]:""; + if (name == "") + { + // command line error message + Report::Error (_("Configuration name is missing.")); + return false; + } + map<string,any> Config = $[ + "name" : name + ]; + + if (action != "create" && !haskey (ProductCreator::Configs, name)) + { + // command line error message, %1 is a name + Report::Error (sformat (_("There is no configuration %1."), name)); + return false; + } + if (action == "edit" || action == "show") + { + ProductCreator::LoadConfig (name); + Config = ProductCreator::Config; + } + if (action == "show") + return true; + + // first, handle required parameters + if (params["output_dir"]:"" != "") + { + Config["iso-directory"] = params["output_dir"]:""; + } + else if (action == "create") + { + // command line error message + Report::Error (_("Path to output directory is missing.")); + return false; + } + + list<string> repos = splitstring (params["repositories"]:"", ","); + if (repos != []) + Config["sources"] = repos; + else if (action == "create") + { + // command line error message + Report::Error (_("List of package repositories is empty.")); + return false; + } + + if (params["profile"]:"" != "") + Config["profile"] = params["profile"]:""; + else if (action == "create") + { + // command line error message + Report::Error (_("Path to AutoYaST profile is missing.")); + return false; + } + if (haskey (params, "copy_profile")) + Config["copy_profile"] = true; + + // there is no manual way for selecting packages: + if (action == "create" || params["profile"]:"" != "") + { + Config["pkgtype"] = "autoyast"; + ProductCreator::profile_parsed = false; + } + + if (params["iso_name"]:"" != "") + Config["isofile"] = params["iso_name"]:""; + else if (action == "create") + Config["isofile"] = name + ".iso"; + + if (haskey (params, "create_iso")) + Config["result"] = "iso"; + else if (action == "create") + Config["result"] = "tree"; + + if (haskey (params, "savespace")) + Config["savespace"] = true; + + if (params["gpg_key"]:"" != "") + { + Config["gpg_key"] = params["gpg_key"]:""; + } + + // no selections + if (action == "create") + Config["type"] = `patterns; + + if (params["isolinux_path"]:"" != "") + { + string file = params["isolinux_path"]:""; + if (!FileUtils::Exists (file)) + { + // command line error message + Report::Error (sformat (_("File %1 does not exist."), file)); + return false; + } + if (SCR::Read(.target.size, file)> 0) + { + string cont = (string)SCR::Read (.target.string, file); + if (cont != nil) + Config["bootconfig"] = cont; + } + } + + ProductCreator::Config = Config; + + // read default isolinux (Config needs to be saved already to + // ProductCreator::Config, it is used by Readisolinux) + if (params["isolinux_path"]:"" == "" && action == "create") + { + ProductCreator::Config["bootconfig"] = + ProductCreator::Readisolinux(); + } + + // save the new configuration into global map, parse autoyast profile + ProductCreator::CommitConfig (); + } + + /** + * Command line handler for List action: list available configurations + */ boolean ListHandler(map params) { ProcessConfigFileOption(params); @@ -42,9 +173,12 @@ } ); - return true; + return false; // = do not try to write } + /** + * Command line handler for Create ISO action + */ boolean CreateIsoHandler(map params) { y2milestone("CreateIsoHandler parameters: %1", params); @@ -60,6 +194,7 @@ if (!ProductCreator::LoadConfig(name)) { + // command line error message CommandLine::Print(sformat(_("Cannot load configuration %1."), name)); return false; } @@ -80,6 +215,7 @@ // verify the destination if (VerifyDialog() != `next) { + // command line error message CommandLine::Print("Cannot verify the destination"); return false; } @@ -94,11 +230,13 @@ integer image_size = (integer)SCR::Read(.target.size, iso_name); if (SCR::Read(.target.size, iso_name) < 0) { + // command line error message (%1 is path) CommandLine::Print(sformat(_("Cannot create ISO image %1."), iso_name)); return false; } else { + // command line info message CommandLine::Print(sformat(_("ISO image %1 has been written."), iso_name)); } @@ -106,10 +244,127 @@ } else { - CommandLine::Print(_("Error: Configuration name cannot be empty.")); + // command line error message + Report::Error (_("Configuration name cannot be empty.")); return false; } return true; } + + /** + * Command line handler for Create Config action: create new product + * configuration + */ + boolean CreateConfigHandler (map params) + { + y2milestone ("CreateConfigHandler parameters: %1", params); + ProcessConfigFileOption(params); + + return ProcessParameters (params, "create"); + } + + /** + * Command line handler for Delete Config action + */ + boolean DeleteConfigHandler (map params) + { + y2milestone ("DeleteConfigHandler parameters: %1", params); + string name = params["name"]:""; + + if (name == "") + { + // command line error message + Report::Error (_("Configuration name is missing.")); + return false; + } + ProductCreator::Configs = filter(string k, map<string,any> v, ProductCreator::Configs, ``(k!=name)); + return true; + } + + /** + * Command line handler for Edit Config action + */ + boolean EditConfigHandler (map params) + { + y2milestone ("EditConfigHandler parameters: %1", params); + ProcessConfigFileOption(params); + + return ProcessParameters (params, "edit"); + } + + /** + * Command line handler for Show Config action + */ + boolean ShowConfigHandler (map params) + { + y2milestone ("EditConfigHandler parameters: %1", params); + ProcessConfigFileOption(params); + if (!ProcessParameters (params, "show")) + return false; + + // summary caption + CommandLine::Print (_("Package Source")); + foreach(string s, ProductCreator::Config["sources"]:[], ``{ + CommandLine::Print ("* " + s); + }); + + + /* + // summary line (%1 is number) + CommandLine::Print (sformat(_("Selected %1 packages"), + size (ProductCreator::Config["packages"]:[]))); + // currently does not have sense: packages from patterns would need + // to be counted as well + */ + if (ProductCreator::Config["profile"]:"" != "") + { + // summary line (%1 is file path) + CommandLine::Print (sformat(_("Using AutoYaST profile %1"), + ProductCreator::Config["profile"]:"")); + } + + + if (ProductCreator::Config["result"]:"tree" == "iso") + { + // summary line (%1/%2 is file path) + CommandLine::Print (sformat(_("Creating ISO image %1/%2"), + ProductCreator::Config["iso-directory"]:"", + ProductCreator::Config["isofile"]:"") ); + } + else + { + // summary line (%1/%2 is file path) + CommandLine::Print (sformat(_("Creating directory tree in %1/%2"), + ProductCreator::Config["iso-directory"]:"", + ProductCreator::Config["name"]:"") ); + } + + string gpgkey = ProductCreator::Config["gpg_key"]:""; + + if (gpgkey != "") + { + list<map> privatekeys = GPG::PrivateKeys(); + string uid = ""; + foreach(map key, privatekeys, + { + if (key["id"]:"" == gpgkey) + { + uid = mergestring(key["uid"]:[], ", "); + } + } + ); + if (uid != "") + uid = sformat(" (%1)", uid); + + // summary text - %1 is GPG key ID (e.g. ABCDEF01), %2 is GPG key user ID (or empty if not defined) + CommandLine::Print (sformat(_("Digitally sign the medium with GPG key %1%2"), gpgkey, uid)); + } + else + { + // summary text + CommandLine::Print (_("The medium will not be digitally signed")); + } + return false; + } } Modified: trunk/product-creator/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/dialogs.ycp?… ============================================================================== --- trunk/product-creator/src/dialogs.ycp (original) +++ trunk/product-creator/src/dialogs.ycp Wed Dec 5 13:18:17 2007 @@ -99,7 +99,6 @@ string caption = _("CD Creator Configuration"); - string source = ProductCreator::Config["source"]:""; string name = ProductCreator::Config["name"]:""; string pkgtype = ProductCreator::Config["pkgtype"]:"package-manager"; @@ -268,7 +267,6 @@ string publisher = ProductCreator::Config["publisher"]:""; string preparer = ProductCreator::Config["preparer"]:""; string result = ProductCreator::Config["result"]:"iso"; - string db = ProductCreator::Config["database"]:"original"; string isofile_path = ProductCreator::Config["isofile"]:""; boolean savespace = ProductCreator::Config["savespace"]:false; @@ -1349,10 +1347,24 @@ // summary caption summary = Summary::AddHeader(summary,_("Output Directory")); - // summary line - summary = Summary::AddLine(summary,sformat(_("Creating directory tree in <b> %1/%2 </b>"), + if (ProductCreator::Config["result"]:"tree" == "iso") + { + summary = Summary::AddLine (summary, + // summary line (%1/%2 is file path) + sformat (_("Creating ISO image %1/%2"), + ProductCreator::Config["iso-directory"]:"", + ProductCreator::Config["isofile"]:"") + ); + } + else + { + summary = Summary::AddLine (summary, + // summary line (%1/%2 is file path) + sformat(_("Creating directory tree in <b> %1/%2 </b>"), ProductCreator::Config["iso-directory"]:"", - ProductCreator::Config["name"]:"") ); + ProductCreator::Config["name"]:"") + ); + } // header in the summary dialog Modified: trunk/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/kiwi_dialogs… ============================================================================== --- trunk/product-creator/src/kiwi_dialogs.ycp (original) +++ trunk/product-creator/src/kiwi_dialogs.ycp Wed Dec 5 13:18:17 2007 @@ -799,9 +799,10 @@ map<string,any> read_config = Kiwi::ReadConfigXML (kiwi_configuration); if (!KiwiConfig["_imported"]:false) { - KiwiConfig = (map<string,any>) union ( - // "type" had different meaning in ProductCreator::Config... - remove (KiwiConfig, "type"), read_config); + // "type" had different meaning in ProductCreator::Config... + if (haskey (KiwiConfig, "type")) + KiwiConfig = remove (KiwiConfig, "type"); + KiwiConfig = (map<string,any>) union (KiwiConfig, read_config); // for new configuration, do not read all from the template y2milestone ("product-creator based configuration..."); foreach (string key, ["addons", "packages", "sources"], { Modified: trunk/product-creator/src/product-creator.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/product-crea… ============================================================================== --- trunk/product-creator/src/product-creator.ycp (original) +++ trunk/product-creator/src/product-creator.ycp Wed Dec 5 13:18:17 2007 @@ -34,16 +34,36 @@ "initialize" : ProductCreator::Read, "finish" : ProductCreator::Write, "actions" : $[ - "list" :$[ + "list" : $[ "handler" : ListHandler, - // translators: command line help text for summary action + // translators: command line help text for list action "help" : _("Print existing configurations") ], - "create-iso" :$[ + "create-iso" : $[ "handler" : CreateIsoHandler, - // translators: command line help text for summary action + // translators: command line help text for create-iso action "help" : _("Create installation ISO image") - ] + ], + "create" : $[ + "handler" : CreateConfigHandler, + // translators: command line help text for create-config action + "help" : _("Create new product configuration") + ], + "delete" : $[ + "handler" : DeleteConfigHandler, + // translators: command line help text for delete-config action + "help" : _("Delete existing configuration") + ], + "edit" : $[ + "handler" : EditConfigHandler, + // translators: command line help text for delete-config action + "help" : _("Edit existing configuration") + ], + "show" : $[ + "handler" : ShowConfigHandler, + // translators: command line help text for show action + "help" : _("Show the summary of selected configuration") + ], ], "options" : $[ "name" : $[ @@ -52,7 +72,7 @@ "type" : "string" ], "passphrase" : $[ - // translators: command line help text for the 'passhrase' option + // translators: command line help text for the 'passphrase' option "help" : _("GPG passhrase required for signing the source."), "type" : "string" ], @@ -66,11 +86,64 @@ "help" : sformat(_("Path to the configuration file (default is %1"), ProductCreator::ConfigFile), "type" : "string" - ] + ], + "output_dir" : $[ + // command line help text for 'output_dir' option + "help" : _("Path to the output directory"), + "type" : "string" + ], + // TODO provide also for create-iso...? + "create_iso" : $[ + // command line help text for 'create_iso' option + "help" : _("Output should be ISO image instead of directory tree"), + ], + "iso_name" : $[ + // command line help text for 'iso_name' option + "help" : _("Name of the output ISO image"), + "type" : "string", + ], + "savespace" : $[ + // command line help text for 'savespace' option + "help" : _("Copy only needed files to save space"), + ], + "profile" : $[ + // command line help text for 'profile' option + "help" : _("Path to AutoYaST profile"), + "type" : "string" + ], + "copy_profile" : $[ + // command line help text for 'copy_profile' option + "help" : _("Copy AutoYaST profile to CD image"), + ], + "isolinux_path" : $[ + // command line help text for 'isolinux_path' option + "help" : _("Path to isolinux.cfg file"), + "type" : "string" + ], + "gpg_key" : $[ + // command line help text for 'gpg_key' option + "help" : _("GPG key ID used to sign a product"), + "type" : "string", + ], + "repositories" : $[ + // command line help text for 'repositories' option + "help" : _("List of package repositories (separated by commas)"), + "type" : "string" + ], ], "mappings" : $[ "list" : ["configfile"], "create-iso" : ["name", "passphrase", "passphrase_file", "configfile"], + "create" : ["name", "configfile", "output_dir", "create_iso", + "iso_name", "savespace", "profile", "copy_profile", "isolinux_path", + "gpg_key", "repositories", + ], + "edit" : ["name", "configfile", "output_dir", "create_iso", + "iso_name", "savespace", "profile", "copy_profile", "isolinux_path", + "gpg_key", "repositories", + ], + "delete" : ["name"], + "show" : ["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] r42708 - in /trunk/pkg-bindings/src: Package.cc PkgProgress.cc PkgProgress.h Source.cc Target.cc
by lslezak＠svn.opensuse.org 05 Dec '07

05 Dec '07

Author: lslezak Date: Wed Dec 5 13:11:15 2007 New Revision: 42708 URL: http://svn.opensuse.org/viewcvs/yast?rev=42708&view=rev Log: - fixed a syntax error and compiler warnings Modified: trunk/pkg-bindings/src/Package.cc trunk/pkg-bindings/src/PkgProgress.cc trunk/pkg-bindings/src/PkgProgress.h trunk/pkg-bindings/src/Source.cc trunk/pkg-bindings/src/Target.cc Modified: trunk/pkg-bindings/src/Package.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Package.cc?rev=… ============================================================================== --- trunk/pkg-bindings/src/Package.cc (original) +++ trunk/pkg-bindings/src/Package.cc Wed Dec 5 13:11:15 2007 @@ -206,7 +206,7 @@ if (repo_name.empty()) { - y2warning("Name of repository '%d' is empty, using URL", index); + y2warning("Name of repository '%zd' is empty, using URL", index); // use URL as the product name std::string name; Modified: trunk/pkg-bindings/src/PkgProgress.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/PkgProgress.cc?… ============================================================================== --- trunk/pkg-bindings/src/PkgProgress.cc (original) +++ trunk/pkg-bindings/src/PkgProgress.cc Wed Dec 5 13:11:15 2007 @@ -42,7 +42,7 @@ if (stages.size() > 0) { // set the first stage to 'in progress' state - pkgprogress.NextStage(); + NextStage(); } } Modified: trunk/pkg-bindings/src/PkgProgress.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/PkgProgress.h?r… ============================================================================== --- trunk/pkg-bindings/src/PkgProgress.h (original) +++ trunk/pkg-bindings/src/PkgProgress.h Wed Dec 5 13:11:15 2007 @@ -40,7 +40,7 @@ ~PkgProgress(); private: - PkgModuleFunctions::CallbackHandler &callback_handler; + const PkgModuleFunctions::CallbackHandler &callback_handler; zypp::ProgressData::ReceiverFnc progress_handler; bool running; Modified: trunk/pkg-bindings/src/Source.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Source.cc?rev=4… ============================================================================== --- trunk/pkg-bindings/src/Source.cc (original) +++ trunk/pkg-bindings/src/Source.cc Wed Dec 5 13:11:15 2007 @@ -269,7 +269,7 @@ if (repos[id]->isDeleted()) { - y2error("Source %d has been deleted, the ID is not valid", id); + y2error("Source %zd has been deleted, the ID is not valid", id); return YRepo_Ptr(); } @@ -277,7 +277,7 @@ } catch (...) { - y2error("Cannot find source with ID: %d", id); + y2error("Cannot find source with ID: %zd", id); // TODO: improve the error message _last_error.setLastError(_("Cannot find source")); } @@ -340,7 +340,7 @@ { if (repos.size() > 0) { - y2warning("Number of registered repositories: %d, skipping repository load!", repos.size()); + y2warning("Number of registered repositories: %zd, skipping repository load!", repos.size()); return YCPBoolean(true); } @@ -1576,7 +1576,7 @@ std::string end_path; // try to convert 'http://server/dir1/dir2/dir3/dir4' -> 'http://server/dir1/.../dir4' - unsigned int pos_first = url_path.find("/"); + std::string::size_type pos_first = url_path.find("/"); if (pos_first == 0) { pos_first = url_path.find("/", 1); @@ -2555,7 +2555,7 @@ if (repo->repoInfo().enabled() != enable) { - ycpwarning("Pkg::SourceEditSet() does not refresh the pool (src: %d, state: %s)", id, enable ? "disabled -> enabled" : "enabled -> disabled"); + ycpwarning("Pkg::SourceEditSet() does not refresh the pool (src: %zd, state: %s)", id, enable ? "disabled -> enabled" : "enabled -> disabled"); } y2debug("set enabled: %d", enable); @@ -2768,7 +2768,7 @@ // load resolvables zypp_ptr()->addResolvables(store); - y2milestone("Loaded %d resolvables", store.size()); + y2milestone("Loaded %zd resolvables", store.size()); } catch(const zypp::repo::RepoNotCachedException &excpt ) { Modified: trunk/pkg-bindings/src/Target.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Target.cc?rev=4… ============================================================================== --- trunk/pkg-bindings/src/Target.cc (original) +++ trunk/pkg-bindings/src/Target.cc Wed Dec 5 13:11:15 2007 @@ -773,7 +773,7 @@ // get all resolvables of the required kind std::list<ResObject::Ptr> objects = store.storedObjects(kind); - y2warning("Removing %d objects of kind '%s' from %s", objects.size(), req_kind.c_str(), target_root.c_str()); + y2warning("Removing %zd objects of kind '%s' from %s", objects.size(), req_kind.c_str(), target_root.c_str()); // remove the resolvables for( std::list<ResObject::Ptr>::const_iterator it = objects.begin(); it != objects.end(); ++it) -- 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] r42707 - in /trunk/pkg-bindings/src: Makefile.am PkgModuleFunctions.h PkgProgress.cc PkgProgress.h Source.cc
by lslezak＠svn.opensuse.org 05 Dec '07

05 Dec '07

Author: lslezak Date: Wed Dec 5 12:56:50 2007 New Revision: 42707 URL: http://svn.opensuse.org/viewcvs/yast?rev=42707&view=rev Log: - moved progress handling to a separate class (PkgProgress) Added: trunk/pkg-bindings/src/PkgProgress.cc trunk/pkg-bindings/src/PkgProgress.h Modified: trunk/pkg-bindings/src/Makefile.am trunk/pkg-bindings/src/PkgModuleFunctions.h trunk/pkg-bindings/src/Source.cc Modified: trunk/pkg-bindings/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Makefile.am?rev… ============================================================================== --- trunk/pkg-bindings/src/Makefile.am (original) +++ trunk/pkg-bindings/src/Makefile.am Wed Dec 5 12:56:50 2007 @@ -22,6 +22,7 @@ Y2CCPkg.cc Y2CCPkg.h \ ycpTools.cc ycpTools.h \ PkgModule.cc PkgModule.h \ + PkgProgress.cc PkgProgress.h \ PkgModuleFunctions.h \ PkgModuleFunctions.cc \ Package.cc \ Modified: trunk/pkg-bindings/src/PkgModuleFunctions.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/PkgModuleFuncti… ============================================================================== --- trunk/pkg-bindings/src/PkgModuleFunctions.h (original) +++ trunk/pkg-bindings/src/PkgModuleFunctions.h Wed Dec 5 12:56:50 2007 @@ -53,7 +53,8 @@ #include <zypp/ProgressData.h> #include "PkgError.h" - +//#include "PkgProgress.h" +class PkgProgress; // textdomain extern "C" { @@ -172,13 +173,8 @@ zypp::repo::RepoType ProbeWithCallbacks(const zypp::Url &url); void ScanProductsWithCallBacks(const zypp::Url &url); - void ProcessStart(const std::string &process, const std::list<std::string> &stages, const std::string &help); - void ProcessProgress(int percent); - void ProcessNextStage(); - void ProcessDone(); - - YCPValue SourceLoadImpl(const zypp::ProgressData::ReceiverFnc & progress = zypp::ProgressData::ReceiverFnc()); - YCPValue SourceStartManagerImpl(const YCPBoolean&, const zypp::ProgressData::ReceiverFnc & progress = zypp::ProgressData::ReceiverFnc()); + YCPValue SourceLoadImpl(PkgProgress &progress); + YCPValue SourceStartManagerImpl(const YCPBoolean& enable, PkgProgress &progress); // After all, APPL_HIGH might be more appropriate, because we suggest // the user what he should do and if it does not work, it's his job to Added: trunk/pkg-bindings/src/PkgProgress.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/PkgProgress.cc?… ============================================================================== --- trunk/pkg-bindings/src/PkgProgress.cc (added) +++ trunk/pkg-bindings/src/PkgProgress.cc Wed Dec 5 12:56:50 2007 @@ -0,0 +1,106 @@ + + +#include "PkgProgress.h" + +#include <Callbacks.YCP.h> + +#include <y2/Y2Function.h> + +void PkgProgress::Start( const std::string &process, const std::list<std::string> &stages, + const std::string &help) +{ + // get the YCP callback handler for destroy event + Y2Function* ycp_handler = callback_handler._ycpCallbacks.createCallback(PkgModuleFunctions::CallbackHandler::YCPCallbacks::CB_ProcessStart); + + y2debug("ProcessStart"); + + // is the callback registered? + if (ycp_handler != NULL) + { + y2debug("Evaluating ProcessStart callback..."); + ycp_handler->appendParameter(YCPString(process)); + + // create list of stages + YCPList lst; + + for(std::list<std::string>::const_iterator it = stages.begin(); + it != stages.end() ; ++it ) + { + lst->add(YCPString(*it) ); + } + + ycp_handler->appendParameter(lst); + + ycp_handler->appendParameter(YCPString(help)); + + // evaluate the callback function + ycp_handler->evaluateCall(); + } + + running = true; + + if (stages.size() > 0) + { + // set the first stage to 'in progress' state + pkgprogress.NextStage(); + } +} + + +void PkgProgress::NextStage() +{ + // get the YCP callback handler for destroy event + Y2Function* ycp_handler = callback_handler._ycpCallbacks.createCallback(PkgModuleFunctions::CallbackHandler::YCPCallbacks::CB_ProcessNextStage); + + // is the callback registered? + if (ycp_handler != NULL) + { + // evaluate the callback function + ycp_handler->evaluateCall(); + } +} + +void PkgProgress::Done() +{ + y2debug("ProcessDone"); + // get the YCP callback handler for destroy event + Y2Function* ycp_handler = callback_handler._ycpCallbacks.createCallback(PkgModuleFunctions::CallbackHandler::YCPCallbacks::CB_ProcessFinished); + + // is the callback registered? + if (ycp_handler != NULL) + { + y2milestone("Evaluating ProcessDone callback..."); + // evaluate the callback function + ycp_handler->evaluateCall(); + } + + running = false; +} + +bool PkgProgress::Receiver(const zypp::ProgressData &progress) +{ + y2milestone("PkgReceiver progress: %lld (%lld%%)", progress.val(), progress.reportValue()); + + // get the YCP callback handler for destroy event + Y2Function* ycp_handler = callback_handler._ycpCallbacks.createCallback(PkgModuleFunctions::CallbackHandler::YCPCallbacks::CB_ProcessProgress); + + // is the callback registered? + if (ycp_handler != NULL) + { + ycp_handler->appendParameter(YCPInteger(progress.reportValue())); + // evaluate the callback function + ycp_handler->evaluateCall(); + } + + return true; +} + +PkgProgress::~PkgProgress() +{ + // report done if it hasn't been called + if (running) + { + Done(); + } +} + Added: trunk/pkg-bindings/src/PkgProgress.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/PkgProgress.h?r… ============================================================================== --- trunk/pkg-bindings/src/PkgProgress.h (added) +++ trunk/pkg-bindings/src/PkgProgress.h Wed Dec 5 12:56:50 2007 @@ -0,0 +1,52 @@ +/* + File: PkgProgress.h + + Author: Ladislav SlezÃ¡k <lslezak(a)novell.com> +/-*/ + +#ifndef PkgProgress_h +#define PkgProgress_h + +#include <string> +#include <list> + +#include <PkgModuleFunctions.h> +#include <Callbacks.YCP.h> + +#include <zypp/ProgressData.h> +#include <boost/bind.hpp> + +class PkgProgress +{ + public: + + PkgProgress(PkgModuleFunctions::CallbackHandler &handler_ref) + : callback_handler(handler_ref), + progress_handler(boost::bind(&PkgProgress::Receiver, this, _1)), + running(false) + {} + + void Start( const std::string &process, const std::list<std::string> &stages, const std::string &help); + + void NextStage(); + + void Done(); + + const zypp::ProgressData::ReceiverFnc & Receiver() + { + return progress_handler; + } + + ~PkgProgress(); + + private: + PkgModuleFunctions::CallbackHandler &callback_handler; + zypp::ProgressData::ReceiverFnc progress_handler; + bool running; + + protected: + bool Receiver(const zypp::ProgressData &progress); +}; + +#endif + Modified: trunk/pkg-bindings/src/Source.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Source.cc?rev=4… ============================================================================== --- trunk/pkg-bindings/src/Source.cc (original) +++ trunk/pkg-bindings/src/Source.cc Wed Dec 5 12:56:50 2007 @@ -48,7 +48,7 @@ #include <sstream> // ostringstream -#include <boost/bind.hpp> +#include <PkgProgress.h> /* Textdomain "pkg-bindings" @@ -417,16 +417,14 @@ stages.push_back("Rebuild Cache"); stages.push_back("Load Data"); - // 3 steps per repository (download, cache rebuild, load resolvables) - ProcessStart("Loading the Package Manager...", stages, "help"); + PkgProgress pkgprogress(_callbackHandler); - // mark refreshing as in progress now - ProcessNextStage(); + // 3 steps per repository (download, cache rebuild, load resolvables) + pkgprogress.Start("Loading the Package Manager...", stages, "help"); - // boost::bind(&PkgModuleFunctions::SourceLoadReceiver, this, _1); - YCPValue ret = SourceLoadImpl(boost::bind(&PkgModuleFunctions::SourceLoadReceiver, this, _1)); + YCPValue ret = SourceLoadImpl(pkgprogress); - ProcessDone(); + pkgprogress.Done(); return ret; } @@ -441,7 +439,7 @@ * @return boolean True on success **/ YCPValue -PkgModuleFunctions::SourceLoadImpl(const zypp::ProgressData::ReceiverFnc &progress) +PkgModuleFunctions::SourceLoadImpl(PkgProgress &progress) { bool success = true; @@ -457,7 +455,7 @@ // set max. value (3 steps per repository - refresh, rebuild, load) zypp::ProgressData prog_total(repos_to_load * 3); - prog_total.sendTo(progress); + prog_total.sendTo(progress.Receiver()); zypp::RepoManager repomanager = CreateRepoManager(); @@ -503,7 +501,7 @@ } } - ProcessNextStage(); + progress.NextStage(); // rebuild cache for (std::vector<YRepo_Ptr>::iterator it = repos.begin(); @@ -547,7 +545,7 @@ } } - ProcessNextStage(); + progress.NextStage(); for (std::vector<YRepo_Ptr>::iterator it = repos.begin(); it != repos.end(); ++it) @@ -595,6 +593,8 @@ YCPValue PkgModuleFunctions::SourceStartManager (const YCPBoolean& enable) { + PkgProgress pkgprogress(_callbackHandler); + // display the progress only when 'enable' is true if (enable->value()) { @@ -603,19 +603,16 @@ stages.push_back("Refresh Sources"); stages.push_back("Rebuild Cache"); stages.push_back("Load Data"); - + // 3 steps per repository (download, cache rebuild, load resolvables) - ProcessStart("Loading the Package Manager...", stages, "help"); - - // mark refreshing as in progress now - ProcessNextStage(); + pkgprogress.Start("Loading the Package Manager...", stages, "help"); } - YCPValue ret = SourceStartManagerImpl(enable, boost::bind(&PkgModuleFunctions::SourceLoadReceiver, this, _1)); + YCPValue ret = SourceStartManagerImpl(enable, pkgprogress); if (enable->value()) { - ProcessDone(); + pkgprogress.Done(); } return ret; @@ -632,11 +629,11 @@ * @return boolean **/ YCPValue -PkgModuleFunctions::SourceStartManagerImpl(const YCPBoolean& enable, const zypp::ProgressData::ReceiverFnc &progress) +PkgModuleFunctions::SourceStartManagerImpl(const YCPBoolean& enable, PkgProgress &progress) { YCPValue success = SourceRestore(); - ProcessNextStage(); + progress.NextStage(); if( enable->value() ) { @@ -2941,79 +2938,3 @@ return zypp::str::toLower(type); } -void PkgModuleFunctions::ProcessStart( const std::string &process, const std::list<std::string> &stages, - const std::string &help) -{ - // get the YCP callback handler for destroy event - Y2Function* ycp_handler = _callbackHandler._ycpCallbacks.createCallback(CallbackHandler::YCPCallbacks::CB_ProcessStart); - - y2debug("ProcessStart"); - - // is the callback registered? - if (ycp_handler != NULL) - { - y2debug("Evaluating ProcessStart callback..."); - ycp_handler->appendParameter(YCPString(process)); - - // create list of stages - YCPList lst; - - for(std::list<std::string>::const_iterator it = stages.begin(); - it != stages.end() ; ++it ) - { - lst->add(YCPString(*it) ); - } - - ycp_handler->appendParameter(lst); - - ycp_handler->appendParameter(YCPString(help)); - - // evaluate the callback function - ycp_handler->evaluateCall(); - } -} - - -void PkgModuleFunctions::ProcessNextStage() -{ - // get the YCP callback handler for destroy event - Y2Function* ycp_handler = _callbackHandler._ycpCallbacks.createCallback(CallbackHandler::YCPCallbacks::CB_ProcessNextStage); - - // is the callback registered? - if (ycp_handler != NULL) - { - // evaluate the callback function - ycp_handler->evaluateCall(); - } -} - -void PkgModuleFunctions::ProcessProgress(int percent) -{ - // get the YCP callback handler for destroy event - Y2Function* ycp_handler = _callbackHandler._ycpCallbacks.createCallback(CallbackHandler::YCPCallbacks::CB_ProcessProgress); - - // is the callback registered? - if (ycp_handler != NULL) - { - ycp_handler->appendParameter( YCPInteger((long long) percent)); - // evaluate the callback function - ycp_handler->evaluateCall(); - } -} - -void PkgModuleFunctions::ProcessDone() -{ - y2debug("ProcessDone"); - // get the YCP callback handler for destroy event - Y2Function* ycp_handler = _callbackHandler._ycpCallbacks.createCallback(CallbackHandler::YCPCallbacks::CB_ProcessFinished); - - // is the callback registered? - if (ycp_handler != NULL) - { - y2milestone("Evaluating ProcessDone callback..."); - // evaluate the callback function - ycp_handler->evaluateCall(); - } -} - - -- 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] r42706 - /tags/branch-SLE-10-SP1-2_13_25/product-creator/
by jsuchome＠svn.opensuse.org 05 Dec '07

05 Dec '07

Author: jsuchome Date: Wed Dec 5 12:54:18 2007 New Revision: 42706 URL: http://svn.opensuse.org/viewcvs/yast?rev=42706&view=rev Log: Created tag branch-SLE-10-SP1-2_13_25 for product-creator Added: tags/branch-SLE-10-SP1-2_13_25/product-creator/ - copied from r42705, branches/SuSE-SLE-10-SP1-Branch/product-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] r42705 - in /branches/SuSE-SLE-10-SP1-Branch/product-creator: VERSION package/yast2-product-creator.changes src/Kiwi.ycp src/kiwi_dialogs.ycp
by jsuchome＠svn.opensuse.org 05 Dec '07

05 Dec '07

Author: jsuchome Date: Wed Dec 5 12:54:15 2007 New Revision: 42705 URL: http://svn.opensuse.org/viewcvs/yast?rev=42705&view=rev Log: - fixed generating configuration path name (#346152) - 2.13.25 Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes branches/SuSE-SLE-10-SP1-Branch/product-creator/src/Kiwi.ycp branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi_dialogs.ycp Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION Wed Dec 5 12:54:15 2007 @@ -1 +1 @@ -2.13.24 +2.13.25 Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes Wed Dec 5 12:54:15 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Dec 5 12:33:16 CET 2007 - jsuchome(a)suse.cz + +- fixed generating configuration path name (#346152) +- 2.13.25 + +------------------------------------------------------------------- Fri Nov 16 12:59:17 CET 2007 - jsuchome(a)suse.cz - do not mention CD source in help texts (#341615) Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/Kiwi.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/Kiwi.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/Kiwi.ycp Wed Dec 5 12:54:15 2007 @@ -741,7 +741,7 @@ if (!FileUtils::Exists (images_dir)) SCR::Execute (.target.mkdir, images_dir); SCR::Execute (.target.bash, sformat ("cp -ar %1 %2/", config_dir, images_dir)); - return (images_dir + KiwiConfig["name"]:""); + return (images_dir + "/" + KiwiConfig["name"]:""); } /** Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi_dialogs.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi_dialogs.ycp Wed Dec 5 12:54:15 2007 @@ -798,9 +798,10 @@ map<string,any> read_config = Kiwi::ReadConfigXML (kiwi_configuration); if (!KiwiConfig["_imported"]:false) { - KiwiConfig = (map<string,any>) union ( - // "type" had different meaning in ProductCreator::Config... - remove (KiwiConfig, "type"), read_config); + // "type" had different meaning in ProductCreator::Config... + if (haskey (KiwiConfig, "type")) + KiwiConfig = remove (KiwiConfig, "type"); + KiwiConfig = (map<string,any>) union (KiwiConfig, read_config); // for new configuration, do not read all from the template y2milestone ("product-creator based configuration..."); foreach (string key, ["addons", "packages", "sources"], { -- 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] r42704 - in /branches/SuSE-SLE-10-SP2-Branch/bootloader: package/yast2-bootloader.changes src/grub/misc.ycp src/routines/lilolike.ycp
by jsrain＠svn.opensuse.org 05 Dec '07

05 Dec '07

Author: jsrain Date: Wed Dec 5 12:39:12 2007 New Revision: 42704 URL: http://svn.opensuse.org/viewcvs/yast?rev=42704&view=rev Log: fixed the device map proposal if USB stick is present (F#302075) Modified: branches/SuSE-SLE-10-SP2-Branch/bootloader/package/yast2-bootloader.changes branches/SuSE-SLE-10-SP2-Branch/bootloader/src/grub/misc.ycp branches/SuSE-SLE-10-SP2-Branch/bootloader/src/routines/lilolike.ycp Modified: branches/SuSE-SLE-10-SP2-Branch/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/bootlo… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/bootloader/package/yast2-bootloader.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/bootloader/package/yast2-bootloader.changes Wed Dec 5 12:39:12 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Dec 5 11:15:12 CET 2007 - jsrain(a)suse.cz + +- fixed the device map proposal if USB stick is present (F#302075) +- 2.13.148 + +------------------------------------------------------------------- Thu Sep 27 18:55:34 CEST 2007 - od(a)suse.de - do not install bootloader in XEN paravirtualized DomU (#308451) Modified: branches/SuSE-SLE-10-SP2-Branch/bootloader/src/grub/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/bootlo… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/bootloader/src/grub/misc.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/bootloader/src/grub/misc.ycp Wed Dec 5 12:39:12 2007 @@ -415,102 +415,7 @@ // copied from src/routines/lilolike.ycp; should be removed there when it is // not needed there any more (by DisksOrder()), as it is grub only global void grub_ProposeDeviceMap () { - BootCommon::device_mapping = $[]; - - map<string,map> targetMap = $[]; - if (Mode::config ()) - y2milestone ("Skipping device map proposing in Config mode"); - else - targetMap = (map<string,map>)Storage::GetTargetMap(); - -//FIXME: This is not the final solution, we must be able to handle both, -//FakeRAIDs _and_ single disks. - - // Search in complete target map for "CT_DMRAID" types - map <string, map> DMTargetMap = filter (string k, map v, targetMap, { - return v["type"]:`CT_UNKNOWN==`CT_DMRAID; - }); - - // If no dmraids are present, search in complete target map for "CT_DISK" - // types. This should be the "normal" case. - if ( size(DMTargetMap) == 0 ) { - targetMap = filter (string k, map v, targetMap, { - return v["type"]:`CT_UNKNOWN==`CT_DISK; - }); - } else { - // If dmraid(s) are found, only use them - - // Get all available dmraids in the proper BIOS order - map out = (map) SCR::Execute (.target.bash_output, "dmraid -s -c"); - - if ( out["exit"]:0 == 0 && out["stdout"]:"" != "" ) { - list<string> DMRaid_devices_in_BIOS_order = - splitstring (out["stdout"]:"", "\n"); - - // Remove last list entry (because it is empty) - integer index_empty = size(DMRaid_devices_in_BIOS_order) - 1; - DMRaid_devices_in_BIOS_order = - remove(DMRaid_devices_in_BIOS_order, index_empty); - - integer DMRaidBiosID = 128; - - // FIXME: This code only work when YaST2-Storage either assigns - // BIOS-IDs to all available DMRaid devices or to none of them. - // Probably it's best to throw this code away once YaST2-Storage - // assigns BIOS-IDs to all available DMRaid devices. - - // Assign BIOS-IDs to DMRaid devices in the Target Map in BIOS - // order - DMTargetMap = listmap (string DMRaidDevice, DMRaid_devices_in_BIOS_order, { - DMRaidDevice = "/dev/mapper/" + DMRaidDevice; - if (haskey(DMTargetMap, DMRaidDevice)) { - if ( !haskey(DMTargetMap[DMRaidDevice]:$[], "bios_id") ) { - DMTargetMap[DMRaidDevice, "bios_id"] = tohexstring(DMRaidBiosID); - DMRaidBiosID = DMRaidBiosID + 1; - } - return $[ DMRaidDevice : DMTargetMap[DMRaidDevice]:$[] ]; - } - }); - y2milestone("sorted (according to BIOS) DMTargetMap: %1", DMTargetMap); - } else { - y2error ("Command: \"dmraid -s -c\" failed, no sorting of DMTargetMap."); - } - - targetMap = DMTargetMap; - } - - y2milestone ("Target map: %1", targetMap); - - // add devices with known bios_id - // collect BIOS IDs which are used - map ids = $[]; - foreach (string target_dev, map target, targetMap, { - string bios_id = target["bios_id"]:""; - if (bios_id != "") - { - integer index = tointeger (bios_id) - tointeger ("0x80"); - string grub_dev = sformat ("hd%1", index); - BootCommon::device_mapping[target_dev] = grub_dev; - ids[index] = true; - } - }); - // and guess other devices - // don't use already used BIOS IDs - foreach (string target_dev, map target, targetMap, { - string bios_id = target["bios_id"]:""; - if (bios_id == "") - { - integer index = 0; - while (ids[index]:false) - index = index + 1; - string grub_dev = sformat ("hd%1", index); - BootCommon::device_mapping[target_dev] = grub_dev; - ids[index] = true; - } - }); - if (StorageDevices::FloppyPresent) - BootCommon::device_mapping[StorageDevices::FloppyDevice] = "fd0"; - y2milestone ("Detected device mapping: %1", BootCommon::device_mapping); + BootCommon::ProposeDeviceMap(); } /** Modified: branches/SuSE-SLE-10-SP2-Branch/bootloader/src/routines/lilolike.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/bootlo… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/bootloader/src/routines/lilolike.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/bootloader/src/routines/lilolike.ycp Wed Dec 5 12:39:12 2007 @@ -962,12 +962,139 @@ } + +/*** helper functions for ProposeDeviceMap: ***/ +/** + * Returns true if any device from list devices is in device_mapping + * marked as hd0. + */ +boolean isHd0(list<string> devices) +{ + boolean ret = false; + + foreach (string value, devices, + { + if (device_mapping[value]:"" == "hd0"){ + ret = true; + } + }); + + return ret; +} + /** - * Generate device map proposal, store it in internal variables + * Returns first key from mapping associated with value. + * Example: + * map = $[ "a" : "1", + * "b" : "2", + * "c" : "3", + * "d" : "2"]; + * getDeviceFromMapping("1", map) -> "a" + * getDeviceFromMapping("2", map) -> "b" + */ +string getKey(string value, map<string, string> mapping) +{ + string ret = ""; + + foreach (string key, string val, mapping, + { + if (value == val){ + ret = key; + return; + } + }); + + return ret; +} + +/** + * This function changes order of devices in device_mapping. + * All devices listed in bad_devices are maped to "hdN" are moved to the end + * (with changed number N). And second step is putting device with boot partition + * on top (i.e. device_mapping[dev_with_boot] = "hd0"). + * + * Example: + * device_mapping = $[ "/dev/sda" : "hd0", + * "/dev/sdb" : "hd1", + * "/dev/sdc" : "hd2", + * "/dev/sdd" : "hd3", + * "/dev/sde" : "hd4" ]; + * bad_devices = [ "/dev/sda", "/dev/sdc" ]; + * + * changeOrderInDeviceMapping(bad_devices); + * // after call, device_mapping is: + * device_mapping -> $[ "/dev/sda" : "hd3", + * "/dev/sdb" : "hd0", + * "/dev/sdc" : "hd4", + * "/dev/sdd" : "hd1", + * "/dev/sde" : "hd2" ]; + */ +void changeOrderInDeviceMapping(list<string> bad_devices) +{ + integer cur_id = 0; + list keys = []; + string value = ""; + string tmp = ""; + string tmp2 = ""; + + // get keys from device_mapping, it's not possible to use foreach over keys and values + // of device_mapping directly, because during the loop device_mapping is changing. + foreach (string key, string value, device_mapping, { keys = add(keys, key); }); + + // put bad_devices at bottom + foreach (string key, (list<string>)keys, + { + value = device_mapping[key]:""; + + // if device is mapped on hdX and this device is _not_ in bad_devices + if (substring(value, 0, 2) == "hd" + && !contains(bad_devices, key)){ + // get device name of mapped on "hd"+cur_id + tmp = getKey("hd" + tostring(cur_id), device_mapping); + + // swap tmp and key devices (swap their mapping) + device_mapping[tmp] = value; + device_mapping[key] = "hd" + tostring(cur_id); + + cur_id = cur_id + 1; + } + }); + + // put device with boot partition on the top: + tmp = (regexptokenize(BootCommon::BootPartitionDevice, "([a-z/]+)[0-9]*"))[0]:""; + if (haskey(device_mapping, tmp) && device_mapping[tmp]:"" != "hd0"){ + y2debug("Putting device with boot partition (%1) on the top.", tmp); + + tmp2 = getKey("hd0", device_mapping); + device_mapping[tmp2] = device_mapping[tmp]:""; + device_mapping[tmp] = "hd0"; + } +} +/*** helper functions END ***/ + +/** + * Generate device map proposal, store it in internal variables. + * + * FATE #302075: + * When user is installing from USB media or any non IDE disk or bios simply + * set any non IDE disk as first and user is not installing on this removable + * (non IDE) disk, the order of disks proposed by bios must be changed because + * of future remove of USB disk. + * This function must find right place for bootloader (which is most probably + * boot sector of boot partition (where /boot dir is located)) and change the + * order of disks in device map. + * This method is only heuristic because order of disks after remove of usb + * disk can't be determined by any method. + * + * Algorithm for solving problem with usb disk propsed by bios as hd0: + * if usbDiskDevice == hd0 && BootDevice != usbDiskDevice: + * change order of disks in device_mappings to have BootDevice as hd0 */ // FIXME: remove that function from here, as it is grub only // NOTE: there is a local copy in routines/grub/misc.ycp now global void ProposeDeviceMap () { + list<string> usb_disks = []; // contains those usb removable disks + device_mapping = $[]; map<string,map> targetMap = $[]; @@ -1061,8 +1188,35 @@ ids[index] = true; } }); + + + // Fill usb_disks list with usb removable devices. + // + // It's not easy to determine how to identify removable usb devices. Now + // it tests if driver of device is usb-storage. If you find better + // algorithm how to find removable usb devices, put it here into foreach + // to apply this algorithm on all devices. + foreach (string target_dev, map target, targetMap, + { + string driver = target["driver"]:""; + if (driver == "usb-storage"){ + usb_disks = add(usb_disks, target_dev); + } + }); + y2milestone("Found usb discs: %1", usb_disks); + + // change order in device_mapping if usb disk is hd0 + // (FATE #302075) + if (isHd0(usb_disks) + && BootCommon::BootPartitionDevice != getKey("hd0", device_mapping)){ + y2milestone ("Detected device mapping: %1", device_mapping); + y2milestone("Changing order in device mapping needed..."); + changeOrderInDeviceMapping(usb_disks); + } + if (StorageDevices::FloppyPresent) device_mapping[StorageDevices::FloppyDevice] = "fd0"; + y2milestone ("Detected device mapping: %1", device_mapping); } -- 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] r42703 - in /trunk/bootloader: package/yast2-bootloader.changes src/grub/misc.ycp src/routines/lilolike.ycp
by jsrain＠svn.opensuse.org 05 Dec '07

05 Dec '07

Author: jsrain Date: Wed Dec 5 12:37:52 2007 New Revision: 42703 URL: http://svn.opensuse.org/viewcvs/yast?rev=42703&view=rev Log: fixed the device map proposal if USB stick is present (F#302075) Modified: trunk/bootloader/package/yast2-bootloader.changes trunk/bootloader/src/grub/misc.ycp trunk/bootloader/src/routines/lilolike.ycp Modified: trunk/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootloa… ============================================================================== --- trunk/bootloader/package/yast2-bootloader.changes (original) +++ trunk/bootloader/package/yast2-bootloader.changes Wed Dec 5 12:37:52 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Dec 5 12:36:32 CET 2007 - jsrain(a)suse.cz + +- fixed the device map proposal if USB stick is present (F#302075) + +------------------------------------------------------------------- Wed Oct 31 14:32:59 CET 2007 - dfiser(a)suse.cz - Adapted to change of StorageDevices API. Modified: trunk/bootloader/src/grub/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/grub/misc.ycp?rev… ============================================================================== --- trunk/bootloader/src/grub/misc.ycp (original) +++ trunk/bootloader/src/grub/misc.ycp Wed Dec 5 12:37:52 2007 @@ -415,102 +415,7 @@ // copied from src/routines/lilolike.ycp; should be removed there when it is // not needed there any more (by DisksOrder()), as it is grub only global void grub_ProposeDeviceMap () { - BootCommon::device_mapping = $[]; - - map<string,map> targetMap = $[]; - if (Mode::config ()) - y2milestone ("Skipping device map proposing in Config mode"); - else - targetMap = (map<string,map>)Storage::GetTargetMap(); - -//FIXME: This is not the final solution, we must be able to handle both, -//FakeRAIDs _and_ single disks. - - // Search in complete target map for "CT_DMRAID" types - map <string, map> DMTargetMap = filter (string k, map v, targetMap, { - return v["type"]:`CT_UNKNOWN==`CT_DMRAID; - }); - - // If no dmraids are present, search in complete target map for "CT_DISK" - // types. This should be the "normal" case. - if ( size(DMTargetMap) == 0 ) { - targetMap = filter (string k, map v, targetMap, { - return v["type"]:`CT_UNKNOWN==`CT_DISK; - }); - } else { - // If dmraid(s) are found, only use them - - // Get all available dmraids in the proper BIOS order - map out = (map) SCR::Execute (.target.bash_output, "dmraid -s -c"); - - if ( out["exit"]:0 == 0 && out["stdout"]:"" != "" ) { - list<string> DMRaid_devices_in_BIOS_order = - splitstring (out["stdout"]:"", "\n"); - - // Remove last list entry (because it is empty) - integer index_empty = size(DMRaid_devices_in_BIOS_order) - 1; - DMRaid_devices_in_BIOS_order = - remove(DMRaid_devices_in_BIOS_order, index_empty); - - integer DMRaidBiosID = 128; - - // FIXME: This code only work when YaST2-Storage either assigns - // BIOS-IDs to all available DMRaid devices or to none of them. - // Probably it's best to throw this code away once YaST2-Storage - // assigns BIOS-IDs to all available DMRaid devices. - - // Assign BIOS-IDs to DMRaid devices in the Target Map in BIOS - // order - DMTargetMap = listmap (string DMRaidDevice, DMRaid_devices_in_BIOS_order, { - DMRaidDevice = "/dev/mapper/" + DMRaidDevice; - if (haskey(DMTargetMap, DMRaidDevice)) { - if ( !haskey(DMTargetMap[DMRaidDevice]:$[], "bios_id") ) { - DMTargetMap[DMRaidDevice, "bios_id"] = tohexstring(DMRaidBiosID); - DMRaidBiosID = DMRaidBiosID + 1; - } - return $[ DMRaidDevice : DMTargetMap[DMRaidDevice]:$[] ]; - } - }); - y2milestone("sorted (according to BIOS) DMTargetMap: %1", DMTargetMap); - } else { - y2error ("Command: \"dmraid -s -c\" failed, no sorting of DMTargetMap."); - } - - targetMap = DMTargetMap; - } - - y2milestone ("Target map: %1", targetMap); - - // add devices with known bios_id - // collect BIOS IDs which are used - map ids = $[]; - foreach (string target_dev, map target, targetMap, { - string bios_id = target["bios_id"]:""; - if (bios_id != "") - { - integer index = tointeger (bios_id) - tointeger ("0x80"); - string grub_dev = sformat ("hd%1", index); - BootCommon::device_mapping[target_dev] = grub_dev; - ids[index] = true; - } - }); - // and guess other devices - // don't use already used BIOS IDs - foreach (string target_dev, map target, targetMap, { - string bios_id = target["bios_id"]:""; - if (bios_id == "") - { - integer index = 0; - while (ids[index]:false) - index = index + 1; - string grub_dev = sformat ("hd%1", index); - BootCommon::device_mapping[target_dev] = grub_dev; - ids[index] = true; - } - }); - if (StorageDevices::FloppyPresent()) - BootCommon::device_mapping[StorageDevices::FloppyDevice()] = "fd0"; - y2milestone ("Detected device mapping: %1", BootCommon::device_mapping); + BootCommon::ProposeDeviceMap(); } /** Modified: trunk/bootloader/src/routines/lilolike.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/lilolike… ============================================================================== --- trunk/bootloader/src/routines/lilolike.ycp (original) +++ trunk/bootloader/src/routines/lilolike.ycp Wed Dec 5 12:37:52 2007 @@ -1143,12 +1143,139 @@ } + +/*** helper functions for ProposeDeviceMap: ***/ +/** + * Returns true if any device from list devices is in device_mapping + * marked as hd0. + */ +boolean isHd0(list<string> devices) +{ + boolean ret = false; + + foreach (string value, devices, + { + if (device_mapping[value]:"" == "hd0"){ + ret = true; + } + }); + + return ret; +} + +/** + * Returns first key from mapping associated with value. + * Example: + * map = $[ "a" : "1", + * "b" : "2", + * "c" : "3", + * "d" : "2"]; + * getDeviceFromMapping("1", map) -> "a" + * getDeviceFromMapping("2", map) -> "b" + */ +string getKey(string value, map<string, string> mapping) +{ + string ret = ""; + + foreach (string key, string val, mapping, + { + if (value == val){ + ret = key; + return; + } + }); + + return ret; +} + /** - * Generate device map proposal, store it in internal variables + * This function changes order of devices in device_mapping. + * All devices listed in bad_devices are maped to "hdN" are moved to the end + * (with changed number N). And second step is putting device with boot partition + * on top (i.e. device_mapping[dev_with_boot] = "hd0"). + * + * Example: + * device_mapping = $[ "/dev/sda" : "hd0", + * "/dev/sdb" : "hd1", + * "/dev/sdc" : "hd2", + * "/dev/sdd" : "hd3", + * "/dev/sde" : "hd4" ]; + * bad_devices = [ "/dev/sda", "/dev/sdc" ]; + * + * changeOrderInDeviceMapping(bad_devices); + * // after call, device_mapping is: + * device_mapping -> $[ "/dev/sda" : "hd3", + * "/dev/sdb" : "hd0", + * "/dev/sdc" : "hd4", + * "/dev/sdd" : "hd1", + * "/dev/sde" : "hd2" ]; + */ +void changeOrderInDeviceMapping(list<string> bad_devices) +{ + integer cur_id = 0; + list keys = []; + string value = ""; + string tmp = ""; + string tmp2 = ""; + + // get keys from device_mapping, it's not possible to use foreach over keys and values + // of device_mapping directly, because during the loop device_mapping is changing. + foreach (string key, string value, device_mapping, { keys = add(keys, key); }); + + // put bad_devices at bottom + foreach (string key, (list<string>)keys, + { + value = device_mapping[key]:""; + + // if device is mapped on hdX and this device is _not_ in bad_devices + if (substring(value, 0, 2) == "hd" + && !contains(bad_devices, key)){ + // get device name of mapped on "hd"+cur_id + tmp = getKey("hd" + tostring(cur_id), device_mapping); + + // swap tmp and key devices (swap their mapping) + device_mapping[tmp] = value; + device_mapping[key] = "hd" + tostring(cur_id); + + cur_id = cur_id + 1; + } + }); + + // put device with boot partition on the top: + tmp = (regexptokenize(BootCommon::BootPartitionDevice, "([a-z/]+)[0-9]*"))[0]:""; + if (haskey(device_mapping, tmp) && device_mapping[tmp]:"" != "hd0"){ + y2debug("Putting device with boot partition (%1) on the top.", tmp); + + tmp2 = getKey("hd0", device_mapping); + device_mapping[tmp2] = device_mapping[tmp]:""; + device_mapping[tmp] = "hd0"; + } +} +/*** helper functions END ***/ + +/** + * Generate device map proposal, store it in internal variables. + * + * FATE #302075: + * When user is installing from USB media or any non IDE disk or bios simply + * set any non IDE disk as first and user is not installing on this removable + * (non IDE) disk, the order of disks proposed by bios must be changed because + * of future remove of USB disk. + * This function must find right place for bootloader (which is most probably + * boot sector of boot partition (where /boot dir is located)) and change the + * order of disks in device map. + * This method is only heuristic because order of disks after remove of usb + * disk can't be determined by any method. + * + * Algorithm for solving problem with usb disk propsed by bios as hd0: + * if usbDiskDevice == hd0 && BootDevice != usbDiskDevice: + * change order of disks in device_mappings to have BootDevice as hd0 */ // FIXME: remove that function from here, as it is grub only // NOTE: there is a local copy in routines/grub/misc.ycp now global void ProposeDeviceMap () { + list<string> usb_disks = []; // contains those usb removable disks + device_mapping = $[]; map<string,map> targetMap = $[]; @@ -1242,8 +1369,34 @@ ids[index] = true; } }); + + // Fill usb_disks list with usb removable devices. + // + // It's not easy to determine how to identify removable usb devices. Now + // it tests if driver of device is usb-storage. If you find better + // algorithm how to find removable usb devices, put it here into foreach + // to apply this algorithm on all devices. + foreach (string target_dev, map target, targetMap, + { + string driver = target["driver"]:""; + if (driver == "usb-storage"){ + usb_disks = add(usb_disks, target_dev); + } + }); + y2milestone("Found usb discs: %1", usb_disks); + + // change order in device_mapping if usb disk is hd0 + // (FATE #302075) + if (isHd0(usb_disks) + && BootCommon::BootPartitionDevice != getKey("hd0", device_mapping)){ + y2milestone ("Detected device mapping: %1", device_mapping); + y2milestone("Changing order in device mapping needed..."); + changeOrderInDeviceMapping(usb_disks); + } + if (StorageDevices::FloppyPresent()) device_mapping[StorageDevices::FloppyDevice()] = "fd0"; + y2milestone ("Detected device mapping: %1", device_mapping); } -- 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] r42702 - in /trunk/core: libyui/src/YCheckBoxFrame.cc package/yast2-core.changes
by sh-sh-sh＠svn.opensuse.org 05 Dec '07

05 Dec '07

Author: sh-sh-sh Date: Wed Dec 5 11:54:09 2007 New Revision: 42702 URL: http://svn.opensuse.org/viewcvs/yast?rev=42702&view=rev Log: Fixed bug #346139: CheckBoxFrame is inverted Modified: trunk/core/libyui/src/YCheckBoxFrame.cc trunk/core/package/yast2-core.changes Modified: trunk/core/libyui/src/YCheckBoxFrame.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YCheckBoxFrame.c… ============================================================================== --- trunk/core/libyui/src/YCheckBoxFrame.cc (original) +++ trunk/core/libyui/src/YCheckBoxFrame.cc Wed Dec 5 11:54:09 2007 @@ -29,8 +29,8 @@ { YCheckBoxFramePrivate( const string & label ) : label( label ) - , autoEnable( autoEnable ) - , invertAutoEnable( invertAutoEnable ) + , autoEnable( true ) + , invertAutoEnable( false ) {} string label; @@ -74,6 +74,7 @@ void YCheckBoxFrame::setAutoEnable( bool autoEnable ) { + // y2debug( "Auto enable %s", autoEnable ? "on" : "off" ); priv->autoEnable = autoEnable; } @@ -84,6 +85,7 @@ void YCheckBoxFrame::setInvertAutoEnable( bool invertAutoEnable ) { + // y2debug( "Invert auto enable %s", invertAutoEnable ? "on" : "off" ); priv->invertAutoEnable = invertAutoEnable; } Modified: trunk/core/package/yast2-core.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/package/yast2-core.changes?… ============================================================================== --- trunk/core/package/yast2-core.changes (original) +++ trunk/core/package/yast2-core.changes Wed Dec 5 11:54:09 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Dec 5 11:53:14 CET 2007 - sh(a)suse.de + +- Fixed bug #346139: CheckBoxFrame is inverted + +------------------------------------------------------------------- Mon Dec 3 11:42:01 CET 2007 - coolo(a)suse.de - continue supporting `Value for RadioButtonGroup (#345490) for now -- 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] r42701 - in /trunk/qt: package/yast2-qt.changes src/pkg/YQPkgConflictList.cc src/pkg/YQPkgConflictList.h
by tgoettlicher＠svn.opensuse.org 05 Dec '07

05 Dec '07

Author: tgoettlicher Date: Wed Dec 5 11:20:43 2007 New Revision: 42701 URL: http://svn.opensuse.org/viewcvs/yast?rev=42701&view=rev Log: Changed conflict dialog to better fit to sat solver's output Modified: trunk/qt/package/yast2-qt.changes trunk/qt/src/pkg/YQPkgConflictList.cc trunk/qt/src/pkg/YQPkgConflictList.h Modified: trunk/qt/package/yast2-qt.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/package/yast2-qt.changes?rev=… ============================================================================== --- trunk/qt/package/yast2-qt.changes (original) +++ trunk/qt/package/yast2-qt.changes Wed Dec 5 11:20:43 2007 @@ -1,7 +1,12 @@ ------------------------------------------------------------------- +Wed Dec 5 11:13:05 CET 2007 - tgoettlicher(a)suse.de + +- Changed conflict dialog to better fit to sat solver's output + +------------------------------------------------------------------- Tue Dec 4 14:57:50 CET 2007 - tgoettlicher(a)suse.de -- fixed popup windows without decorations (#345825) +- Fixed popup windows without decorations (#345825) ------------------------------------------------------------------- Fri Nov 30 17:20:49 CET 2007 - sh(a)suse.de Modified: trunk/qt/src/pkg/YQPkgConflictList.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgConflictList.cc?… ============================================================================== --- trunk/qt/src/pkg/YQPkgConflictList.cc (original) +++ trunk/qt/src/pkg/YQPkgConflictList.cc Wed Dec 5 11:20:43 2007 @@ -341,7 +341,10 @@ while ( it != solutions.end() ) { - new YQPkgConflictResolution( _resolutionsHeader, *it ); + YQPkgConflictResolution * solution = new YQPkgConflictResolution( _resolutionsHeader, *it ); + CHECK_PTR( solution ); + solution->setOpen(true); + ++it; } } Modified: trunk/qt/src/pkg/YQPkgConflictList.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgConflictList.h?r… ============================================================================== --- trunk/qt/src/pkg/YQPkgConflictList.h (original) +++ trunk/qt/src/pkg/YQPkgConflictList.h Wed Dec 5 11:20:43 2007 @@ -111,7 +111,7 @@ static void dumpList( QListViewItem * parent, const QString & longText, const QString & header = QString::null, - int splitThreshold = 5 ); + int splitThreshold = 3 ); protected: -- 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] r42700 - /tags/stable-2_16_5/ncurses/
by kmachalkova＠svn.opensuse.org 05 Dec '07

05 Dec '07

Author: kmachalkova Date: Wed Dec 5 11:17:30 2007 New Revision: 42700 URL: http://svn.opensuse.org/viewcvs/yast?rev=42700&view=rev Log: Created tag stable-2_16_5 for ncurses Added: tags/stable-2_16_5/ncurses/ - copied from r42699, trunk/ncurses/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0