Author: lslezak Date: Wed Apr 23 13:19:48 2008 New Revision: 46978 URL: http://svn.opensuse.org/viewcvs/yast?rev=46978&view=rev Log: - PackageSystem.ycp - do not initialize the package callbacks, they are already initialized in PackageCallbacks constructor - Product.ycp - do not initialize the package manager, read the installed product from /etc/SuSE-relase file instead (bnc#380652) - 2.16.55 Modified: trunk/yast2/VERSION trunk/yast2/library/modules/SuSERelease.ycp trunk/yast2/library/packages/src/PackageSystem.ycp trunk/yast2/library/packages/src/Product.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=46978&r1=46977&r2=46978&view=diff ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Wed Apr 23 13:19:48 2008 @@ -1 +1 @@ -2.16.54 +2.16.55 Modified: trunk/yast2/library/modules/SuSERelease.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/modules/SuSERelease.ycp?rev=46978&r1=46977&r2=46978&view=diff ============================================================================== --- trunk/yast2/library/modules/SuSERelease.ycp (original) +++ trunk/yast2/library/modules/SuSERelease.ycp Wed Apr 23 13:19:48 2008 @@ -78,7 +78,6 @@ * @return string the release information */ global string ReleaseName () { -{ if (Stage::initial ()) { return (string)SCR::Read (.content.PRODUCT); @@ -108,6 +107,40 @@ } } +/** + * Get information about the release + * Is limited for the currently running product + * @param directory containing the installed system (/ in installed system) + * @return string the release information + */ +global string ReleaseVersion() +{ + if (Stage::initial ()) + { + return (string)SCR::Read (.content.VERSION); + } + + string contents = ReleaseFileContents ("/"); + string version = ""; + + if (contents != "?") + { + list<string> lines = splitstring (contents, "\n"); + lines = filter (string l, lines, {return l != "";}); + + list<string> components = splitstring (lines[0]:"", " "); + + foreach(string c, components, + { + if (version == "" && regexpmatch (c, "^[0-9\\.]+$")) + { + version = c; + } + } + ); + } + + return version; } Modified: trunk/yast2/library/packages/src/PackageSystem.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/packages/src/PackageSystem.ycp?rev=46978&r1=46977&r2=46978&view=diff ============================================================================== --- trunk/yast2/library/packages/src/PackageSystem.ycp (original) +++ trunk/yast2/library/packages/src/PackageSystem.ycp Wed Apr 23 13:19:48 2008 @@ -55,7 +55,6 @@ */ global void EnsureTargetInit() { PackageLock::Check (); - PackageCallbacks::InitPackageCallbacks (); // always initizalize target, it should be cheap according to #45356 target_initialized = Pkg::TargetInit ("/", false); } @@ -75,8 +74,6 @@ return; } - PackageCallbacks::InitPackageCallbacks (); - if(! target_initialized) { // make sure we have the RPM keys imported Modified: trunk/yast2/library/packages/src/Product.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/packages/src/Product.ycp?rev=46978&r1=46977&r2=46978&view=diff ============================================================================== --- trunk/yast2/library/packages/src/Product.ycp (original) +++ trunk/yast2/library/packages/src/Product.ycp Wed Apr 23 13:19:48 2008 @@ -13,8 +13,7 @@ import "Mode"; import "Stage"; - import "PackageLock"; - import "PackageSystem"; + import "SuSERelease"; /** * General product name and version @@ -73,46 +72,6 @@ */ global string shortlabel = ""; -global list > FindBaseProducts() { - // bugzilla #238556 - if (! PackageLock::Check()) { - y2error ("Locked!"); - return []; - } - - // the target at the sources must be initialized - PackageSystem::EnsureTargetInit(); - PackageSystem::EnsureSourceInit(); - - // installed products are computed by the solver - Pkg::PkgSolve(true); - - y2milestone ("Looking for base products"); - list > products = (list >) - Pkg::TargetProducts (); - - y2milestone ("All found products: %1", products); - products = filter (map p, products, { - // bug 165314, relnotes_url needn't be defined (or empty string) - if (p["relnotes_url"]:"" != "") { - string rn_url = (string) p["relnotes_url"]:""; - relnotesurl_all = add (relnotesurl_all, rn_url); - // bug 180581, relnotes should be identified by name - product_of_relnotes[rn_url] = p["display_name"]:""; - } - return p["category"]:"" == "base"; - }); - - y2milestone ("Found base products: %1", products); - if (size (products) == 0) - y2error ("No base product found"); - else if (size (products) > 1) - y2warning ("More than one base product found"); - return products; -} - - - // ----------------------------------------------- /** @@ -162,37 +121,9 @@ } else if (!Mode::config ()) { - // bugzilla #238556 - if (! PackageLock::Check()) { - y2error ("Locked!"); - return; - } - Pkg::TargetInitialize ("/"); -// list all_products = Pkg::TargetProducts(); // get all products - -// map last_product = all_products[0]:$[]; // get last installed product - -// name = last_product["name"]:""; -// version = last_product["version"]:""; -// vendor = last_product["vendor"]:""; -// TODO distproduct = last_product["distproduct"]:""; -// TODO distversion = last_product["distversion"]:""; -// TODO baseproduct = last_product["baseproduct"]:""; -// TODO if (baseproduct == "") baseproduct = name; -// TODO baseversion = last_product["baseversion"]:""; - -// relnotesurl = last_product["relnotesurl"]:""; - -// flags = splitstring (last_product["flags"]:"", " "); - - list > base_products = FindBaseProducts(); - map base_product = base_products[0]:$[];// there should be only one - hopefuly - name = base_product["display_name"]:base_product["summary"]:base_product["name"]:""; - short_name = base_product["short_name"]:name; - version = base_product["version"]:""; - vendor = base_product["vendor"]:""; - relnotesurl = base_product["relnotes_url"]:""; - flags = base_product["flags"]:[]; + name = SuSERelease::ReleaseName(); + short_name = name; + version = SuSERelease::ReleaseVersion(); } if(distproduct == nil) distproduct = ""; Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=46978&r1=46977&r2=46978&view=diff ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Wed Apr 23 13:19:48 2008 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Wed Apr 23 11:50:23 CEST 2008 - lslezak@suse.cz + +- PackageSystem.ycp - do not initialize the package callbacks, + they are already initialized in PackageCallbacks constructor +- Product.ycp - do not initialize the package manager, read the + installed product from /etc/SuSE-relase file instead (bnc#380652) +- 2.16.55 + +------------------------------------------------------------------- Tue Apr 22 15:15:59 CEST 2008 - jsrain@suse.cz - rename MODLIST variable to YAST_MODLIST to prevent conflicts -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org