Author: lslezak Date: Mon May 12 17:31:11 2008 New Revision: 47461 URL: http://svn.opensuse.org/viewcvs/yast?rev=47461&view=rev Log: - added Pkg::AddLock(), Pkg::GetLocks() and Pkg::RemoveLock() for manipulating libzypp locks, required to lock 64-bit packages on PPC32 during installation (bnc#336678) Note: locks are loaded in Pkg::TargetInit(), explicitly saved in Pkg::TargetFinish() (implicit loading is in Pkg::PkgSolve(), implicit saving in Pkg::PkgCommit()) - 2.16.33 Added: trunk/pkg-bindings/src/Locks.cc Modified: trunk/pkg-bindings/VERSION trunk/pkg-bindings/package/yast2-pkg-bindings.changes trunk/pkg-bindings/src/Makefile.am trunk/pkg-bindings/src/PkgFunctions.h trunk/pkg-bindings/src/Target_Load.cc Modified: trunk/pkg-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/VERSION?rev=47461&r1=47460&r2=47461&view=diff ============================================================================== --- trunk/pkg-bindings/VERSION (original) +++ trunk/pkg-bindings/VERSION Mon May 12 17:31:11 2008 @@ -1 +1 @@ -2.16.32 +2.16.33 Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/package/yast2-pkg-bindings.changes?rev=47461&r1=47460&r2=47461&view=diff ============================================================================== --- trunk/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ trunk/pkg-bindings/package/yast2-pkg-bindings.changes Mon May 12 17:31:11 2008 @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Mon May 12 17:21:19 CEST 2008 - lslezak@suse.cz + +- added Pkg::AddLock(), Pkg::GetLocks() and Pkg::RemoveLock() + for manipulating libzypp locks, required to lock 64-bit packages + on PPC32 during installation (bnc#336678) + + Note: locks are loaded in Pkg::TargetInit(), explicitly saved in + Pkg::TargetFinish() (implicit loading is in Pkg::PkgSolve(), + implicit saving in Pkg::PkgCommit()) +- 2.16.33 + +------------------------------------------------------------------- Fri May 2 10:59:16 CEST 2008 - lslezak@suse.cz - pass requested product in the media change callback (bnc#330094, Added: trunk/pkg-bindings/src/Locks.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Locks.cc?rev=47461&view=auto ============================================================================== --- trunk/pkg-bindings/src/Locks.cc (added) +++ trunk/pkg-bindings/src/Locks.cc Mon May 12 17:31:11 2008 @@ -0,0 +1,467 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2008 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + +/* + File: $Id$ + Author: Ladislav Slezák + Namespace: Pkg + Summary: Functions for accessing locks in the package manager +*/ + + +#include "PkgFunctions.h" +#include "log.h" + +#include + +#include +#include +#include +#include +#include +#include + +#include + +// SEARCH_* constants (SEARCH_STRING, SEARCH_SUBSTRING,...) +extern "C" +{ +#include "satsolver/repo.h" +} + + +/** + * @builtin AddLock + * @short Addd a lock to the package manager + * @description + * Set the given locale as the output locale -- all messages from the package manager (errors, warnings,...) + * will be returned in the selected language. This built-in does not change package selection in any way. + * see http://en.opensuse.org/Libzypp/Locksfile for more information + * @param string lock Definition of the lock + * @return void + */ +YCPValue +PkgFunctions::AddLock(const YCPMap &lock) +{ + zypp::PoolQuery query; + + try + { + for_(map_it, lock.begin(), lock.end()) + { + YCPValue key(map_it.key()); + YCPValue val(map_it.value()); + + if (key.isNull()) + { + y2warning("Warning: ignoring 'nil' key in lock map"); + continue; + } + + if (val.isNull()) + { + y2warning("Warning: ignoring 'nil' value in lock map"); + continue; + } + + if (key->isString()) + { + std::string key_str(key->asString()->value()); + + // add kind + if (key_str == "kind") + { + if (val->isList()) + { + YCPList items(val->asList()); + + int index = 0; + int list_size = items.size(); + + while(index < list_size) + { + YCPValue list_item(items->value(index)); + + if (!list_item.isNull() && list_item->isString()) + { + query.addKind(zypp::ResKind(list_item->asString()->value())); + } + else + { + y2error("Invalid item at index %d in \"kind\" list", index); + return YCPBoolean(false); + } + + index++; + } + } + else + { + y2error("Error %s is not list", val->toString().c_str()); + return YCPBoolean(false); + } + } + else if (key_str == "install_status") + { + if (val->isString()) + { + std::string status_str(val->asString()->value()); + + if (status_str == "installed") + { + query.setInstalledOnly(); + } + else if (status_str == "uninstalled") + { + query.setUninstalledOnly(); + } + else if (status_str == "all") + { + query.setStatusFilterFlags(zypp::PoolQuery::ALL); + } + else + { + y2error("Unknown install_status status value: %s", status_str.c_str()); + return YCPBoolean(false); + } + } + else + { + y2error("Type of key 'install_status' must be string, found: %s", val->toString().c_str()); + return YCPBoolean(false); + } + } + else if (key_str == "repo_id") + { + if (val->isList()) + { + YCPList items(val->asList()); + + int index = 0; + int list_size = items.size(); + + while(index < list_size) + { + YCPValue list_item(items->value(index)); + + if (!list_item.isNull() && list_item->isInteger()) + { + RepoId repo_id = list_item->asInteger()->value(); + + YRepo_Ptr repo_ptr = logFindRepository(repo_id); + + if (repo_ptr) + { + query.addRepo(repo_ptr->repoInfo().alias()); + } + else + { + y2error("Repository %zd not found", repo_id); + return YCPBoolean(false); + } + } + else + { + y2error("Invalid item at index %d in \"repo_id\" list", index); + return YCPBoolean(false); + } + + index++; + } + } + else + { + y2error("Error: 'repo_id' value is not list: %s", val->toString().c_str()); + return YCPBoolean(false); + } + } + else if (key_str == "case_sensitive") + { + if (val->isBoolean()) + { + bool cs = val->asBoolean()->value(); + query.setCaseSensitive(cs); + } + else + { + y2error("Type of key 'case_sensitive' must be boolean, found: %s", val->toString().c_str()); + return YCPBoolean(false); + } + } + else if (key_str == "global_string") + { + if (val->isList()) + { + YCPList items(val->asList()); + + int index = 0; + int list_size = items.size(); + + while(index < list_size) + { + YCPValue list_item(items->value(index)); + + if (!list_item.isNull() && list_item->isString()) + { + std::string global_str = list_item->asString()->value(); + query.addString(global_str); + } + else + { + y2error("Invalid item at index %d in \"global_string\" list: %s, string expected", index, list_item->toString().c_str()); + return YCPBoolean(false); + } + + index++; + } + } + else + { + y2error("Error: 'global_string' value is not list: %s", val->toString().c_str()); + return YCPBoolean(false); + } + } + else if (key_str == "string_type") + { + if (val->isString()) + { + std::string str_type = val->asString()->value(); + + INT << "string_type: " << str_type << std::endl; + + if (str_type == "exact") + query.setMatchExact(); + else if (str_type == "substring") + query.setMatchSubstring(); + else if (str_type == "glob") + query.setMatchGlob(); + else if (str_type == "regex") + query.setMatchRegex(); + else + { + y2error("Unknown 'string_type' value: %s", val->toString().c_str()); + return YCPBoolean(false); + } + } + else + { + y2error("Type of key 'string_type' must be string, found: %s", val->toString().c_str()); + return YCPBoolean(false); + } + } + // it is probably an attribute + else if (std::string(key_str, 0, 9) == "solvable:") + { + if (val->isList()) + { + YCPList items(val->asList()); + + int index = 0; + int list_size = items.size(); + + y2internal("list_size %d", list_size); + + while(index < list_size) + { + YCPValue list_item(items->value(index)); + + if (!list_item.isNull() && list_item->isString()) + { + std::string attr = list_item->asString()->value(); + + query.addAttribute(zypp::sat::SolvAttr(key_str), attr); + } + else + { + y2error("Invalid item at index %d at \"%s\" key: %s, string expected", index, key_str.c_str(), list_item->toString().c_str()); + return YCPBoolean(false); + } + + index++; + } + } + else + { + y2error("Error: value '%s' in list at key '%s' is not a list", val->toString().c_str(), key_str.c_str()); + return YCPBoolean(false); + } + } + } + else + { + y2error("Key %s is not string", key->toString().c_str()); + } + } + + // and finally add the lock + zypp::Locks &locks = zypp::Locks::instance(); + + DBG << "Adding query: " << query << std::endl; + + locks.addLock(query); + +// TODO FIXME: huh, the config must be saved? (otherwise it doesn't work) + zypp::Pathname lock_file(_target_root + zypp::ZConfig::instance().locksFile()); + locks.save(lock_file); + } + catch (zypp::Exception & excpt) + { + y2warning("Error while parsing lock map %s: %s", lock->toString().c_str(), excpt.asString().c_str()); + return YCPBoolean(false); + } + + return YCPBoolean(true); +} + + +YCPMap PkgFunctions::PoolQuery2YCPMap(const zypp::PoolQuery &pool_query) +{ + YCPMap lock; + + zypp::PoolQuery::AttrRawStrMap attrs(pool_query.attributes()); + + // add attributes - name, summary... + if (!attrs.empty()) + { + for_(attr_it, attrs.begin(), attrs.end()) + { + YCPList attr_list; + + for_(attr_list_it, attr_it->second.begin(), attr_it->second.end()) + { + attr_list->add(YCPString(*attr_list_it)); + } + + lock->add(YCPString(attr_it->first.asString()), attr_list); + } + + } + + // add "kind" attribute + if (!pool_query.kinds().empty()) + { + YCPList kind_list; + + for_(kind_it, pool_query.kinds().begin(), pool_query.kinds().end()) + { + kind_list->add(YCPString(kind_it->asString())); + } + + lock->add(YCPString("kind"), kind_list); + } + + // add "install_status" attribute + std::string status; + + switch(pool_query.statusFilterFlags()) + { + case zypp::PoolQuery::ALL : status = "all"; break; + case zypp::PoolQuery::INSTALLED_ONLY : status = "installed"; break; + case zypp::PoolQuery::UNINSTALLED_ONLY : status = "uninstalled"; break; + } + + if (!status.empty()) + { + lock->add(YCPString("install_status"), YCPString(status)); + } + + // add "repo" attribute + if (!pool_query.repos().empty()) + { + YCPList repo_id_list; + + for_(repo_it, pool_query.repos().begin(), pool_query.repos().end()) + { + repo_id_list->add(YCPInteger(logFindAlias(*repo_it))); + } + + lock->add(YCPString("repo_id"), repo_id_list); + } + + + // add "case_sensitive" attribute + lock->add(YCPString("case_sensitive"), YCPBoolean(pool_query.caseSensitive())); + + // add "global_string" attribute + if (!pool_query.strings().empty()) + { + YCPList glob_string; + + for_(string_it, pool_query.strings().begin(), pool_query.strings().end()) + { + glob_string->add(YCPString(*string_it)); + } + + lock->add(YCPString("global_string"), glob_string); + } + + // add "string_type" attribute + std::string str_type; + + switch(pool_query.matchType()) + { + case SEARCH_STRING : str_type = "exact"; break; + case SEARCH_SUBSTRING : str_type = "substring"; break; + case SEARCH_GLOB : str_type = "glob"; break; + case SEARCH_REGEX : str_type = "regex"; break; + } + + if (!str_type.empty()) + { + lock->add(YCPString("string_type"), YCPString(str_type)); + } + + return lock; +} + +YCPValue PkgFunctions::GetLocks() +{ + YCPList ret; + + zypp::Locks &locks = zypp::Locks::instance(); + + for_(it, locks.begin(), locks.end()) + { + ret->add(PoolQuery2YCPMap(*it)); + } + + return ret; +} + + +YCPValue PkgFunctions::RemoveLock(const YCPMap &lock) +{ + zypp::Locks &locks = zypp::Locks::instance(); + + for_(it, locks.begin(), locks.end()) + { + YCPMap it_map = PoolQuery2YCPMap(*it); + + // is it the same lock? + if (it_map.compare(lock) == YO_EQUAL) + { + locks.removeLock(*it); + return YCPBoolean(true); + } + } + + return YCPBoolean(false); +} + Modified: trunk/pkg-bindings/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Makefile.am?rev=47461&r1=47460&r2=47461&view=diff ============================================================================== --- trunk/pkg-bindings/src/Makefile.am (original) +++ trunk/pkg-bindings/src/Makefile.am Mon May 12 17:31:11 2008 @@ -34,7 +34,7 @@ Resolvable_Properties.cc \ Selection.cc \ Target.cc Target_DU.cc Target_Load.cc \ - Locale.cc \ + Locale.cc Locks.cc \ Source_Callbacks.cc \ Source_Create.cc \ Source_Download.cc \ Modified: trunk/pkg-bindings/src/PkgFunctions.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/PkgFunctions.h?rev=47461&r1=47460&r2=47461&view=diff ============================================================================== --- trunk/pkg-bindings/src/PkgFunctions.h (original) +++ trunk/pkg-bindings/src/PkgFunctions.h Mon May 12 17:31:11 2008 @@ -53,6 +53,11 @@ #include "PkgError.h" class PkgProgress; +namespace zypp +{ + class PoolQuery; +} + /** * A simple class for package management access */ @@ -153,6 +158,8 @@ // convert MountPointSet to YCP Map YCPMap MPS2YCPMap(const zypp::DiskUsageCounter::MountPointSet &mps); + YCPMap PoolQuery2YCPMap(const zypp::PoolQuery &pool_query); + zypp::Url shortenUrl(const zypp::Url &url); // convert Exception to string represenatation @@ -653,6 +660,13 @@ /* TYPEINFO: list<any>(integer)*/ YCPValue PkgCommit (const YCPInteger& medianr); + /* TYPEINFO: boolean(map)*/ + YCPValue AddLock(const YCPMap &lock); + /* TYPEINFO: list>()*/ + YCPValue GetLocks(); + /* TYPEINFO: boolean(map)*/ + YCPValue RemoveLock(const YCPMap &lock); + /* FIXME: is this needed? */ YCPValue PkgPrepareOrder (YCPList args); /* TYPEINFO: list()*/ Modified: trunk/pkg-bindings/src/Target_Load.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Target_Load.cc?rev=47461&r1=47460&r2=47461&view=diff ============================================================================== --- trunk/pkg-bindings/src/Target_Load.cc (original) +++ trunk/pkg-bindings/src/Target_Load.cc Mon May 12 17:31:11 2008 @@ -34,6 +34,9 @@ #include "PkgProgress.h" #include +#include +#include + /* Textdomain "pkg-bindings" */ @@ -79,6 +82,19 @@ _target_root = zypp::Pathname(r); + // locks are optional, might not be present on the target + zypp::Pathname lock_file(_target_root + zypp::ZConfig::instance().locksFile()); + try + { + // read and apply the persistent locks + y2milestone("Reading locks from %s", lock_file.asString().c_str()); + zypp::Locks::instance().readAndApply(lock_file); + } + catch (zypp::Exception & excpt) + { + y2warning("Error reading persistent locks from %s", lock_file.asString().c_str()); + } + pkgprogress.Done(); return YCPBoolean(true); @@ -192,6 +208,9 @@ try { zypp_ptr()->finishTarget(); + + zypp::Pathname lock_file(_target_root + zypp::ZConfig::instance().locksFile()); + zypp::Locks::instance().save(lock_file); } catch (zypp::Exception & excpt) { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org