August 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r40644 - /trunk/core/libyui/src/Y2UINamespace.cc
by sh-sh-sh＠svn.opensuse.org 31 Aug '07

31 Aug '07

Author: sh-sh-sh Date: Fri Aug 31 12:51:48 2007 New Revision: 40644 URL: http://svn.opensuse.org/viewcvs/yast?rev=40644&view=rev Log: reduced verbose low-level logging Modified: trunk/core/libyui/src/Y2UINamespace.cc Modified: trunk/core/libyui/src/Y2UINamespace.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/Y2UINamespace.cc… ============================================================================== --- trunk/core/libyui/src/Y2UINamespace.cc (original) +++ trunk/core/libyui/src/Y2UINamespace.cc Fri Aug 31 12:51:48 2007 @@ -33,6 +33,8 @@ #include "YUIComponent.h" #include "Y2UINamespace.h" +#define VERBOSE_UI_CALLS 0 + YCPValue Y2UINamespace::SetLanguage( const YCPString & language ) @@ -844,8 +846,10 @@ Y2Function* Y2UINamespace::createFunctionCall (const string name, constFunctionTypePtr type) { +#if VERBOSE_UI_CALLS y2debug ("Creating function call for %s", name.c_str ()); - y2debug ("whose type is %s", type? type->toString().c_str() : "unknown"); + y2debug ("whose type is %s", type? type->toString().c_str() : "unknown"); +#endif // overloading: functions with same name must be adjacent in m_symbols @@ -884,7 +888,9 @@ // found exact match // BTW, p->position() may change as we go, don't get confused. // What matters is our own counting. +#if VERBOSE_UI_CALLS y2debug ("Found symbol '%s' @%d", p->toString ().c_str (), p->position ()); +#endif return new Y2UIFunction (this, m_comp, it - b, play_macro_blocks); } } -- 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] r40643 - /tags/stable-2_15_70/packager/
by lslezak＠svn.opensuse.org 31 Aug '07

31 Aug '07

Author: lslezak Date: Fri Aug 31 12:50:15 2007 New Revision: 40643 URL: http://svn.opensuse.org/viewcvs/yast?rev=40643&view=rev Log: Created tag stable-2_15_70 for packager Added: tags/stable-2_15_70/packager/ - copied from r40642, trunk/packager/ -- 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] r40642 - in /trunk/packager: VERSION package/yast2-packager.changes src/clients/inst_productsources.ycp
by lslezak＠svn.opensuse.org 31 Aug '07

31 Aug '07

Author: lslezak Date: Fri Aug 31 12:49:46 2007 New Revision: 40642 URL: http://svn.opensuse.org/viewcvs/yast?rev=40642&view=rev Log: - check exit status and report errors when adding online repositories (#306272) - 2.15.70 Modified: trunk/packager/VERSION trunk/packager/package/yast2-packager.changes trunk/packager/src/clients/inst_productsources.ycp Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=40642&r1=40… ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Fri Aug 31 12:49:46 2007 @@ -1 +1 @@ -2.15.69 +2.15.70 Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Fri Aug 31 12:49:46 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Aug 31 12:45:59 CEST 2007 - lslezak(a)suse.cz + +- check exit status and report errors when adding online + repositories (#306272) +- 2.15.70 + +------------------------------------------------------------------- Wed Aug 29 16:35:46 CEST 2007 - lslezak(a)suse.cz - fully initialize the target system when adding an update Modified: trunk/packager/src/clients/inst_productsources.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/inst_produc… ============================================================================== --- trunk/packager/src/clients/inst_productsources.ycp (original) +++ trunk/packager/src/clients/inst_productsources.ycp Fri Aug 31 12:49:46 2007 @@ -1021,9 +1021,29 @@ return false; } - Pkg::SourceRefreshNow (src_id); + if (!Pkg::SourceRefreshNow (src_id)) + { + Report::Error (sformat ( + // TRANSLATORS: pop-up error message + // %1 is replaced with a repository name or URL + _("Adding repository %1 failed"), + (repo_name != "" ? repo_name : url)) + + "\n" + Pkg::LastError(); + ); + return false; + } - Pkg::SourceSetEnabled (src_id, true); + if (!Pkg::SourceSetEnabled (src_id, true)) + { + Report::Error (sformat ( + // TRANSLATORS: pop-up error message + // %1 is replaced with a repository name or URL + _("Adding repository %1 failed"), + (repo_name != "" ? repo_name : url)) + + "\n" + Pkg::LastError(); + ); + return false; + } if (Stage::initial()) { AddOnProduct::Integrate (src_id); -- 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] r40641 - /tags/stable-2_15_48/pkg-bindings/
by lslezak＠svn.opensuse.org 31 Aug '07

31 Aug '07

Author: lslezak Date: Fri Aug 31 11:36:36 2007 New Revision: 40641 URL: http://svn.opensuse.org/viewcvs/yast?rev=40641&view=rev Log: Created tag stable-2_15_48 for pkg-bindings Added: tags/stable-2_15_48/pkg-bindings/ - copied from r40640, trunk/pkg-bindings/ -- 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] r40640 - in /trunk/pkg-bindings: VERSION package/yast2-pkg-bindings.changes src/Package.cc
by lslezak＠svn.opensuse.org 31 Aug '07

31 Aug '07

Author: lslezak Date: Fri Aug 31 11:36:21 2007 New Revision: 40640 URL: http://svn.opensuse.org/viewcvs/yast?rev=40640&view=rev Log: - fixed inverted result of PkgAvailable() and PkgInstalled() - 2.15.48 Modified: trunk/pkg-bindings/VERSION trunk/pkg-bindings/package/yast2-pkg-bindings.changes trunk/pkg-bindings/src/Package.cc Modified: trunk/pkg-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/VERSION?rev=40640&r… ============================================================================== --- trunk/pkg-bindings/VERSION (original) +++ trunk/pkg-bindings/VERSION Fri Aug 31 11:36:21 2007 @@ -1 +1 @@ -2.15.47 +2.15.48 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 Aug 31 11:36:21 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Aug 31 11:28:08 CEST 2007 - lslezak(a)suse.cz + +- fixed inverted result of PkgAvailable() and PkgInstalled() +- 2.15.48 + +------------------------------------------------------------------- Thu Aug 30 19:57:49 CEST 2007 - lslezak(a)suse.cz - don't log debug messages from zypp if debug logging is turned off 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 Fri Aug 31 11:36:21 2007 @@ -530,9 +530,9 @@ PkgModuleFunctions::searchPackage(const YCPString &package, bool installed) { bool found = false; - std::string pkg = package->value(); + std::string pkgname = package->value(); - if (pkg.empty()) + if (pkgname.empty()) { y2warning("Pkg::%s: Package name is empty", installed ? "PkgInstalled" : "PkgAvailable"); return YCPBoolean(false); @@ -540,8 +540,8 @@ try { - for (zypp::ResPool::byName_iterator it = zypp_ptr()->pool().byNameBegin(pkg); - it != zypp_ptr()->pool().byNameEnd(pkg); + for (zypp::ResPool::byName_iterator it = zypp_ptr()->pool().byNameBegin(pkgname); + it != zypp_ptr()->pool().byNameEnd(pkgname); ++it) { zypp::Package::constPtr pkg = zypp::asKind<zypp::Package>( it->resolvable() ); @@ -549,7 +549,8 @@ if (pkg != NULL) { long long sid = logFindAlias(pkg->repository().info().alias()); - if ((installed && sid >= 0LL) || (!installed && sid < 0LL)) + y2debug("Package '%s' repo: %lld", pkgname.c_str(), sid); + if ((installed && sid < 0LL) || (!installed && sid >= 0LL)) { found = true; break; @@ -561,7 +562,7 @@ { } - y2milestone("Package '%s' %s: %s", pkg.c_str(), installed ? "installed" : "available", found ? "true" : "false"); + y2milestone("Package '%s' %s: %s", pkgname.c_str(), installed ? "installed" : "available", found ? "true" : "false"); return YCPBoolean(found); } -- 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] r40639 - /tags/stable-2_15_51/yast2/
by locilka＠svn.opensuse.org 31 Aug '07

31 Aug '07

Author: locilka Date: Fri Aug 31 10:58:01 2007 New Revision: 40639 URL: http://svn.opensuse.org/viewcvs/yast?rev=40639&view=rev Log: Created tag stable-2_15_51 for yast2 Added: tags/stable-2_15_51/yast2/ - copied from r40638, trunk/yast2/ -- 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] r40638 - in /trunk/yast2: VERSION library/system/src/Kernel.ycp package/yast2.changes
by locilka＠svn.opensuse.org 31 Aug '07

31 Aug '07

Author: locilka Date: Fri Aug 31 10:49:47 2007 New Revision: 40638 URL: http://svn.opensuse.org/viewcvs/yast?rev=40638&view=rev Log: - Fixing evaluation of unreadable cpuflags in Kernel.ycp (#303842). - 2.15.51 Modified: trunk/yast2/VERSION trunk/yast2/library/system/src/Kernel.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=40638&r1=40637… ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Fri Aug 31 10:49:47 2007 @@ -1 +1 @@ -2.15.50 +2.15.51 Modified: trunk/yast2/library/system/src/Kernel.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/system/src/Kernel.… ============================================================================== --- trunk/yast2/library/system/src/Kernel.ycp (original) +++ trunk/yast2/library/system/src/Kernel.ycp Fri Aug 31 10:49:47 2007 @@ -373,7 +373,15 @@ // get flags from WFM /proc/cpuinfo (for pae and tsc tests below) string cpuinfo_flags = (string) SCR::Read(.proc.cpuinfo.value."0"."flags"); // check only first processor - list cpuflags = (size(cpuinfo_flags) > 0) ? splitstring(cpuinfo_flags, " ") : []; + list cpuflags = []; + + // bugzilla #303842 + if (cpuflags != nil) { + cpuflags = (size(cpuinfo_flags) > 0) ? splitstring(cpuinfo_flags, " ") : []; + } else { + y2error ("Cannot read cpuflags"); + y2milestone ("Mounted: %1", SCR::Execute (.target.bash_output, "mount -l")); + } /* // check for "roughly" >= 4GB memory (see bug #40729) list memories = (list) SCR::Read(.probe.memory); Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Fri Aug 31 10:49:47 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Aug 31 10:34:10 CEST 2007 - locilka(a)suse.cz + +- Fixing evaluation of unreadable cpuflags in Kernel.ycp (#303842). +- 2.15.51 + +------------------------------------------------------------------- Thu Aug 30 11:25:02 CEST 2007 - jsrain(a)suse.cz - removed the -s/--style option from manpage and help (#300362) -- 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] r40637 - /tags/stable-2_15_47/pkg-bindings/
by lslezak＠svn.opensuse.org 30 Aug '07

30 Aug '07

Author: lslezak Date: Thu Aug 30 20:11:29 2007 New Revision: 40637 URL: http://svn.opensuse.org/viewcvs/yast?rev=40637&view=rev Log: Created tag stable-2_15_47 for pkg-bindings Added: tags/stable-2_15_47/pkg-bindings/ - copied from r40636, trunk/pkg-bindings/ -- 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] r40636 - in /trunk/pkg-bindings: VERSION package/yast2-pkg-bindings.changes src/Package.cc src/PkgModuleFunctions.h yast2-pkg-bindings.spec.in
by lslezak＠svn.opensuse.org 30 Aug '07

30 Aug '07

Author: lslezak Date: Thu Aug 30 20:11:24 2007 New Revision: 40636 URL: http://svn.opensuse.org/viewcvs/yast?rev=40636&view=rev Log: - added new builtins PkgAvailable() and PkgInstalled() which work with package names (in contrast to IsAvailable() or IsProvided() which work with 'provides' property) (#299683,#302246) - 2.15.47 Modified: trunk/pkg-bindings/VERSION trunk/pkg-bindings/package/yast2-pkg-bindings.changes trunk/pkg-bindings/src/Package.cc trunk/pkg-bindings/src/PkgModuleFunctions.h trunk/pkg-bindings/yast2-pkg-bindings.spec.in Modified: trunk/pkg-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/VERSION?rev=40636&r… ============================================================================== --- trunk/pkg-bindings/VERSION (original) +++ trunk/pkg-bindings/VERSION Thu Aug 30 20:11:24 2007 @@ -1 +1 @@ -2.15.46 +2.15.47 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 Thu Aug 30 20:11:24 2007 @@ -6,6 +6,10 @@ - preliminary fix for source redirection (compile fix only) (#294481) - report errors when adding a new repository (#306272) +- added new builtins PkgAvailable() and PkgInstalled() which work + with package names (in contrast to IsAvailable() or IsProvided() + which work with 'provides' property) (#299683,#302246) +- 2.15.47 ------------------------------------------------------------------- Wed Aug 29 09:36:00 CEST 2007 - lslezak(a)suse.cz 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 Thu Aug 30 20:11:24 2007 @@ -526,6 +526,81 @@ return YCPBoolean( match.item ); } +YCPValue +PkgModuleFunctions::searchPackage(const YCPString &package, bool installed) +{ + bool found = false; + std::string pkg = package->value(); + + if (pkg.empty()) + { + y2warning("Pkg::%s: Package name is empty", installed ? "PkgInstalled" : "PkgAvailable"); + return YCPBoolean(false); + } + + try + { + for (zypp::ResPool::byName_iterator it = zypp_ptr()->pool().byNameBegin(pkg); + it != zypp_ptr()->pool().byNameEnd(pkg); + ++it) + { + zypp::Package::constPtr pkg = zypp::asKind<zypp::Package>( it->resolvable() ); + + if (pkg != NULL) + { + long long sid = logFindAlias(pkg->repository().info().alias()); + if ((installed && sid >= 0LL) || (!installed && sid < 0LL)) + { + found = true; + break; + } + } + } + } + catch (...) + { + } + + y2milestone("Package '%s' %s: %s", pkg.c_str(), installed ? "installed" : "available", found ? "true" : "false"); + + return YCPBoolean(found); +} + +/** + * @builtin PkgInstalled + * + * @short returns 'true' if the package is installed in the system + * @description + * tag can be a package name, a string from requires/provides + * or a file name (since a package implictly provides all its files) + * + * @param string package name of the package + * @return boolean + * @usage Pkg::PkgInstalled("glibc") -> true +*/ +YCPValue +PkgModuleFunctions::PkgInstalled(const YCPString& package) +{ + return searchPackage(package, true); +} + +// ------------------------ +/** + * @builtin PkgAvailable + * @short Check if package is available + * @description + * returns 'true' if the package is available on any of the currently + * active installation sources. (i.e. it is installable) + * + * @param string package name of the package + * @return boolean + * @usage Pkg::PkgInstalled("yast2") -> true +*/ +YCPValue +PkgModuleFunctions::PkgAvailable(const YCPString& package) +{ + return searchPackage(package, false); +} struct ProvideProcess { 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 Thu Aug 30 20:11:24 2007 @@ -181,6 +181,8 @@ // convert Exception to string represenatation std::string ExceptionAsString(const zypp::Exception &e); + YCPValue searchPackage(const YCPString &package, bool installed); + private: /** @@ -566,9 +568,13 @@ /* TYPEINFO: boolean(string)*/ YCPValue IsProvided (const YCPString& tag); /* TYPEINFO: boolean(string)*/ + YCPValue PkgInstalled(const YCPString& package); + /* TYPEINFO: boolean(string)*/ YCPValue IsSelected (const YCPString& tag); /* TYPEINFO: boolean(string)*/ YCPValue IsAvailable (const YCPString& tag); + /* TYPEINFO: boolean(string)*/ + YCPValue PkgAvailable(const YCPString& package); /* TYPEINFO: map<string,any>(list<string>)*/ YCPValue DoProvide (const YCPList& args); /* TYPEINFO: map<string,any>(list<string>)*/ Modified: trunk/pkg-bindings/yast2-pkg-bindings.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/yast2-pkg-bindings.… ============================================================================== --- trunk/pkg-bindings/yast2-pkg-bindings.spec.in (original) +++ trunk/pkg-bindings/yast2-pkg-bindings.spec.in Thu Aug 30 20:11:24 2007 @@ -2,11 +2,11 @@ @HEADER@ BuildRequires: blocxx-devel docbook-xsl-stylesheets doxygen gcc-c++ libgcrypt-devel libxcrypt-devel libxslt perl-XML-Writer rpm-devel sgml-skel yast2-core-devel yast2-devtools boost boost-devel dbus-1-devel hal-devel -BuildRequires: libzypp-devel >= 3.13.11 -BuildRequires: libzypp >= 3.13.11 +BuildRequires: libzypp-devel >= 3.21.0 +BuildRequires: libzypp >= 3.21.0 -# new API (RepoManager instead of SourceManager) -Requires: libzypp >= 3.13.11 +# changed requestMedia callback +Requires: libzypp >= 3.21.0 Summary: - -- 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] r40635 - in /trunk/pkg-bindings: package/yast2-pkg-bindings.changes src/Source.cc
by lslezak＠svn.opensuse.org 30 Aug '07

30 Aug '07

Author: lslezak Date: Thu Aug 30 20:04:36 2007 New Revision: 40635 URL: http://svn.opensuse.org/viewcvs/yast?rev=40635&view=rev Log: - report errors when adding a new repository (#306272) Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes trunk/pkg-bindings/src/Source.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 Thu Aug 30 20:04:36 2007 @@ -5,6 +5,7 @@ (#306458) - preliminary fix for source redirection (compile fix only) (#294481) +- report errors when adding a new repository (#306272) ------------------------------------------------------------------- Wed Aug 29 09:36:00 CEST 2007 - lslezak(a)suse.cz 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 Thu Aug 30 20:04:36 2007 @@ -2130,12 +2130,12 @@ // load resolvables only when they are missing if (!AnyResolvableFrom(repo->repoInfo().alias())) { - LoadResolvablesFrom(repo->repoInfo()); + success = LoadResolvablesFrom(repo->repoInfo()); } } else { - // the source has been disables, remove resolvables from the pool + // the source has been disabled, remove resolvables from the pool RemoveResolvablesFrom(repo->repoInfo().alias()); } @@ -2216,6 +2216,7 @@ catch ( const zypp::Exception & expt ) { y2error ("Error while refreshing the source: %s", expt.asString().c_str()); + _last_error.setLastError(repo->repoInfo().alias() + ": " + ExceptionAsString(expt)); return YCPBoolean(false); } @@ -2589,7 +2590,9 @@ } catch (const zypp::Exception& excpt) { - y2internal("Caught unknown error"); + std::string alias = repoinfo.alias(); + y2internal("Error: Loading resolvables failed: %s", ExceptionAsString(excpt).c_str()); + _last_error.setLastError("'" + alias + "': " + ExceptionAsString(excpt)); success = false; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0