Hello community,
here is the log from the commit of package yast2-pkg-bindings for
openSUSE:Factory checked in at 2018-11-01 19:12:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-pkg-bindings (Old)
and /work/SRC/openSUSE:Factory/.yast2-pkg-bindings.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-pkg-bindings"
Thu Nov 1 19:12:49 2018 rev:202 rq:645895 version:4.1.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/yast2-pkg-bindings/yast2-pkg-bindings-devel-doc.changes
2013-10-20 10:56:14.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.yast2-pkg-bindings.new/yast2-pkg-bindings-devel-doc.changes
2018-11-01 19:12:53.050042375 +0100
@@ -1,0 +2,5 @@
+Fri Aug 17 15:33:34 CEST 2018 - [email protected]
+
+- Switched license in spec file from SPDX2 to SPDX3 format.
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/yast2-pkg-bindings/yast2-pkg-bindings.changes
2018-07-07 21:57:22.203395912 +0200
+++
/work/SRC/openSUSE:Factory/.yast2-pkg-bindings.new/yast2-pkg-bindings.changes
2018-11-01 19:12:53.098042377 +0100
@@ -1,0 +2,30 @@
+Wed Oct 31 11:41:54 UTC 2018 - [email protected]
+
+- Fix probing repository with URL including variable (bsc#1090193)
+- 4.1.0
+
+-------------------------------------------------------------------
+Mon Oct 29 16:53:20 UTC 2018 - [email protected]
+
+- Drop no longer used methods:
+-- SetArchitecture and SystemArchitecture as only user Product
+ Creator is dropped
+-- AddLock, GetLocks, RemoveLock as it was needed only once for
+ specific architecture that is no longer supported
+-- TargetRebuildInit as recreating rpm database is no longer used
+ during upgrade
+-- TargetFileHasOwner as old workaround for upgrade no longer
+ needed
+-- TargetBlockSize as it is not longer needed to count disk usage
+
+-------------------------------------------------------------------
+Tue Oct 16 15:03:37 CEST 2018 - [email protected]
+
+- Added license file to spec.
+
+-------------------------------------------------------------------
+Fri Aug 17 15:36:16 CEST 2018 - [email protected]
+
+- Switched license in spec file from SPDX2 to SPDX3 format.
+
+-------------------------------------------------------------------
Old:
----
yast2-pkg-bindings-4.0.13.tar.bz2
New:
----
yast2-pkg-bindings-4.1.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-pkg-bindings-devel-doc.spec ++++++
--- /var/tmp/diff_new_pack.TS5Hat/_old 2018-11-01 19:12:53.590042397 +0100
+++ /var/tmp/diff_new_pack.TS5Hat/_new 2018-11-01 19:12:53.594042397 +0100
@@ -17,7 +17,7 @@
Name: yast2-pkg-bindings-devel-doc
-Version: 4.0.13
+Version: 4.1.0
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-pkg-bindings-%{version}.tar.bz2
@@ -35,7 +35,7 @@
BuildArch: noarch
Requires: yast2-pkg-bindings = %{version}
Summary: YaST2 - Documentation for yast2-pkg-bindings package
-License: GPL-2.0
+License: GPL-2.0-only
Group: Documentation/HTML
%description
++++++ yast2-pkg-bindings.spec ++++++
--- /var/tmp/diff_new_pack.TS5Hat/_old 2018-11-01 19:12:53.606042397 +0100
+++ /var/tmp/diff_new_pack.TS5Hat/_new 2018-11-01 19:12:53.610042398 +0100
@@ -17,7 +17,7 @@
Name: yast2-pkg-bindings
-Version: 4.0.13
+Version: 4.1.0
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -32,7 +32,7 @@
BuildRequires: yast2-devtools >= 3.1.10
Summary: YaST2 - Package Manager Access
-License: GPL-2.0
+License: GPL-2.0-only
Group: System/YaST
%description
@@ -57,5 +57,6 @@
%{yast_plugindir}/libpy2Pkg.so.*
%{yast_plugindir}/libpy2Pkg.so
%doc %{yast_docdir}
+%license COPYING
%changelog
++++++ yast2-pkg-bindings-4.0.13.tar.bz2 -> yast2-pkg-bindings-4.1.0.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-pkg-bindings-4.0.13/package/yast2-pkg-bindings-devel-doc.changes
new/yast2-pkg-bindings-4.1.0/package/yast2-pkg-bindings-devel-doc.changes
--- old/yast2-pkg-bindings-4.0.13/package/yast2-pkg-bindings-devel-doc.changes
2018-07-04 17:29:34.000000000 +0200
+++ new/yast2-pkg-bindings-4.1.0/package/yast2-pkg-bindings-devel-doc.changes
2018-11-01 12:34:09.000000000 +0100
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Fri Aug 17 15:33:34 CEST 2018 - [email protected]
+
+- Switched license in spec file from SPDX2 to SPDX3 format.
+
+-------------------------------------------------------------------
Thu Oct 17 10:55:21 UTC 2013 - [email protected]
- remove usage of dropped y2doc generator
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-pkg-bindings-4.0.13/package/yast2-pkg-bindings-devel-doc.spec
new/yast2-pkg-bindings-4.1.0/package/yast2-pkg-bindings-devel-doc.spec
--- old/yast2-pkg-bindings-4.0.13/package/yast2-pkg-bindings-devel-doc.spec
2018-07-04 17:29:34.000000000 +0200
+++ new/yast2-pkg-bindings-4.1.0/package/yast2-pkg-bindings-devel-doc.spec
2018-11-01 12:34:09.000000000 +0100
@@ -16,9 +16,9 @@
#
Name: yast2-pkg-bindings-devel-doc
-Version: 4.0.13
+Version: 4.1.0
Release: 0
-License: GPL-2.0
+License: GPL-2.0-only
Group: Documentation/HTML
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-pkg-bindings-%{version}.tar.bz2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-pkg-bindings-4.0.13/package/yast2-pkg-bindings.changes
new/yast2-pkg-bindings-4.1.0/package/yast2-pkg-bindings.changes
--- old/yast2-pkg-bindings-4.0.13/package/yast2-pkg-bindings.changes
2018-07-04 17:29:34.000000000 +0200
+++ new/yast2-pkg-bindings-4.1.0/package/yast2-pkg-bindings.changes
2018-11-01 12:34:09.000000000 +0100
@@ -1,4 +1,34 @@
-------------------------------------------------------------------
+Wed Oct 31 11:41:54 UTC 2018 - [email protected]
+
+- Fix probing repository with URL including variable (bsc#1090193)
+- 4.1.0
+
+-------------------------------------------------------------------
+Mon Oct 29 16:53:20 UTC 2018 - [email protected]
+
+- Drop no longer used methods:
+-- SetArchitecture and SystemArchitecture as only user Product
+ Creator is dropped
+-- AddLock, GetLocks, RemoveLock as it was needed only once for
+ specific architecture that is no longer supported
+-- TargetRebuildInit as recreating rpm database is no longer used
+ during upgrade
+-- TargetFileHasOwner as old workaround for upgrade no longer
+ needed
+-- TargetBlockSize as it is not longer needed to count disk usage
+
+-------------------------------------------------------------------
+Tue Oct 16 15:03:37 CEST 2018 - [email protected]
+
+- Added license file to spec.
+
+-------------------------------------------------------------------
+Fri Aug 17 15:36:16 CEST 2018 - [email protected]
+
+- Switched license in spec file from SPDX2 to SPDX3 format.
+
+-------------------------------------------------------------------
Wed Jul 4 12:55:04 CEST 2018 - [email protected]
- SavePkgService: Checking if the service file still exists before
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-pkg-bindings-4.0.13/package/yast2-pkg-bindings.spec
new/yast2-pkg-bindings-4.1.0/package/yast2-pkg-bindings.spec
--- old/yast2-pkg-bindings-4.0.13/package/yast2-pkg-bindings.spec
2018-07-04 17:29:34.000000000 +0200
+++ new/yast2-pkg-bindings-4.1.0/package/yast2-pkg-bindings.spec
2018-11-01 12:34:09.000000000 +0100
@@ -17,14 +17,14 @@
Name: yast2-pkg-bindings
-Version: 4.0.13
+Version: 4.1.0
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
Group: System/YaST
-License: GPL-2.0
+License: GPL-2.0-only
BuildRequires: docbook-xsl-stylesheets
BuildRequires: gcc-c++
@@ -59,3 +59,4 @@
%{yast_plugindir}/libpy2Pkg.so.*
%{yast_plugindir}/libpy2Pkg.so
%doc %{yast_docdir}
+%license COPYING
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-pkg-bindings-4.0.13/src/Arch.cc
new/yast2-pkg-bindings-4.1.0/src/Arch.cc
--- old/yast2-pkg-bindings-4.0.13/src/Arch.cc 2018-07-04 17:29:34.000000000
+0200
+++ new/yast2-pkg-bindings-4.1.0/src/Arch.cc 2018-11-01 12:34:09.000000000
+0100
@@ -31,7 +31,6 @@
#include <string>
#include <ycp/YCPString.h>
-#include <ycp/YCPBoolean.h>
#include <zypp/ZConfig.h>
@@ -50,49 +49,3 @@
y2milestone("Current system architecture: %s", arch.c_str());
return YCPString(arch);
}
-
-/**
- * @builtin SetArchitecture
- * @short
- * @description Change the architecture. The package manager (libzypp)
- * does not expect that the system architecture will change at runtime.
- * It should be set as soon as possible before using other commands.
- * @param string architecture the new architecture, e.g. "i386", "ppc",
"s390x"...
- * @return boolean true on success
- */
-YCPValue
-PkgFunctions::SetArchitecture(const YCPString &architecture)
-{
- std::string arch(architecture->value());
-
- try
- {
- y2warning("Switching architecture to: %s", arch.c_str());
- zypp::Arch new_arch(arch);
- zypp::ZConfig::instance().setSystemArchitecture(new_arch);
- }
- catch (const zypp::Exception& excpt)
- {
- y2error("Switching to architecture %s failed: %s", arch.c_str(),
excpt.asString().c_str());
- _last_error.setLastError(ExceptionAsString(excpt));
- return YCPBoolean(false);
- }
-
- return YCPBoolean(true);
-}
-
-/**
- * @builtin SystemArchitecture
- * @short
- * @description
- * @return string default system architecture for the system
- */
-YCPValue
-PkgFunctions::SystemArchitecture()
-{
- std::string
def_arch(zypp::ZConfig::defaultSystemArchitecture().asString());
- y2milestone("Default system architecture: %s", def_arch.c_str());
-
- return YCPString(def_arch);
-}
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-pkg-bindings-4.0.13/src/Locks.cc
new/yast2-pkg-bindings-4.1.0/src/Locks.cc
--- old/yast2-pkg-bindings-4.0.13/src/Locks.cc 2018-07-04 17:29:34.000000000
+0200
+++ new/yast2-pkg-bindings-4.1.0/src/Locks.cc 1970-01-01 01:00:00.000000000
+0100
@@ -1,513 +0,0 @@
-/*
------------------------------------------------------------------------------
- * 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 <[email protected]>
- Namespace: Pkg
- Summary: Functions for accessing locks in the package manager
-*/
-
-
-#include <ostream>
-
-#include "PkgFunctions.h"
-#include "log.h"
-
-#include <y2util/Y2SLog.h>
-
-#include <ycp/YCPList.h>
-#include <ycp/YCPMap.h>
-#include <ycp/YCPString.h>
-#include <ycp/YCPVoid.h>
-#include <ycp/YCPBoolean.h>
-#include <ycp/YCPInteger.h>
-
-#include <zypp/Locks.h>
-
-// UINT_MAX
-#include <climits>
-
-
-/**
- * @builtin AddLock
- * @short Add a lock to the package manager
- * @description
- * Add a new lock to the package manager. Input parameter is a map $[ "kind" :
list<string>,
- * "install_status":string, "repo_id":list<integer>, "case_sensitive" :
boolean, "global_string":list<string>
- * "string_type" : string, "solvable:.*" : list<string> ]
- *
- * see http://en.opensuse.org/Libzypp/Locksfile for more information
- * @param map lock Definition of the lock
- * @return boolean true on success
- */
-YCPValue
-PkgFunctions::AddLock(const YCPMap &lock)
-{
- zypp::PoolQuery query;
-
- try
- {
- for_(map_it, lock.begin(), lock.end())
- {
- YCPValue key(map_it->first);
- YCPValue val(map_it->second);
-
- 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 %lld 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();
-
- 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();
-
- 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);
-
- // merge the lock to the current locks (to be returned by GetLocks())
- locks.merge();
- }
- 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.matchMode())
- {
- case zypp::Match::STRING : str_type = "exact"; break;
- case zypp::Match::SUBSTRING : str_type = "substring"; break;
- case zypp::Match::GLOB : str_type = "glob"; break;
- case zypp::Match::REGEX : str_type = "regex"; break;
- default: break;
- }
-
- if (!str_type.empty())
- {
- lock->add(YCPString("string_type"), YCPString(str_type));
- }
-
- return lock;
-}
-
-/**
- * @builtin GetLocks
- * @short Get list of current locks
- * @description
- * Returns list of of current locks, see AddLock() for details about returned
lock map.
- *
- * see http://en.opensuse.org/Libzypp/Locksfile for more information
- * @return list list of locks (YCP maps)
- */
-YCPValue PkgFunctions::GetLocks()
-{
- YCPList ret;
-
- zypp::Locks &locks = zypp::Locks::instance();
-
- for_(it, locks.begin(), locks.end())
- {
- ret->add(PoolQuery2YCPMap(*it));
- }
-
- return ret;
-}
-
-
-/**
- * @builtin RemoveLock
- * @short Remove a lock
- * @description
- * Removes a lock from the package manager
- *
- * @param integer lock_idx index of the lock to remove, use GetLocks()
function for obtaining the index
- * @return boolean true on success
- */
-YCPValue PkgFunctions::RemoveLock(const YCPInteger &lock_idx)
-{
- if (lock_idx.isNull())
- {
- y2error("Invaid lock index: nil");
- return YCPBoolean(false);
- }
-
- long long idxl = lock_idx->value();
-
- // libzypp uses unsigned int, but YCP has 64 bit integers, check limits
- if (idxl < 0 || idxl > UINT_MAX)
- {
- y2error("Invalid lock index: %lld", idxl);
- return YCPBoolean(false);
- }
-
- // convert to unsigned (it's safe due to the above check)
- unsigned int idx = idxl;
-
- try
- {
- zypp::Locks &locks = zypp::Locks::instance();
-
- if (locks.size() < idx + 1)
- {
- y2error("Invalid lock index %d, %zd locks defined", idx,
locks.size());
- return YCPBoolean(false);
- }
-
- zypp::Locks::const_iterator it = locks.begin();
-
- unsigned int i = 0;
- while(i < idx)
- {
- it++;
- i++;
- }
-
- locks.removeLock(*it);
- return YCPBoolean(true);
- }
- catch (zypp::Exception &excpt)
- {
- y2warning("Error while removing lock %d: %s", idx,
excpt.asString().c_str());
- }
-
- return YCPBoolean(false);
-}
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-pkg-bindings-4.0.13/src/Makefile.am
new/yast2-pkg-bindings-4.1.0/src/Makefile.am
--- old/yast2-pkg-bindings-4.0.13/src/Makefile.am 2018-07-04
17:29:34.000000000 +0200
+++ new/yast2-pkg-bindings-4.1.0/src/Makefile.am 2018-11-01
12:34:09.000000000 +0100
@@ -32,7 +32,7 @@
Resolvable_Patches.cc \
Resolvable_Properties.cc \
Target.cc Target_DU.cc Target_Load.cc \
- Locale.cc Locks.cc \
+ Locale.cc \
Source_Callbacks.cc \
Source_Create.cc \
Source_Download.cc \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-pkg-bindings-4.0.13/src/PkgFunctions.h
new/yast2-pkg-bindings-4.1.0/src/PkgFunctions.h
--- old/yast2-pkg-bindings-4.0.13/src/PkgFunctions.h 2018-07-04
17:29:34.000000000 +0200
+++ new/yast2-pkg-bindings-4.1.0/src/PkgFunctions.h 2018-11-01
12:34:09.000000000 +0100
@@ -206,8 +206,6 @@
// 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
@@ -577,8 +575,6 @@
// target related
/* TYPEINFO: boolean(string,boolean)*/
YCPValue TargetInit (const YCPString& root, const YCPBoolean& unused);
- /* TYPEINFO: boolean(string)*/
- YCPValue TargetRebuildInit(const YCPString& root);
/* TYPEINFO: boolean(string)*/
YCPValue TargetInitialize (const YCPString& root);
/* TYPEINFO: boolean(string, map<any,any>)*/
@@ -595,8 +591,6 @@
YCPInteger TargetUsed (const YCPString&);
/* TYPEINFO: integer(string)*/
YCPInteger TargetAvailable (const YCPString&);
- /* TYPEINFO: integer(string)*/
- YCPInteger TargetBlockSize (const YCPString&);
/* TYPEINFO: boolean(string)*/
YCPBoolean TargetInstall (const YCPString&);
/* TYPEINFO: boolean(string)*/
@@ -607,8 +601,6 @@
YCPValue TargetInitDU (const YCPList&);
/* TYPEINFO: map<string,list<integer>>()*/
YCPValue TargetGetDU ();
- /* TYPEINFO: boolean(string)*/
- YCPBoolean TargetFileHasOwner (const YCPString&);
/* TYPEINFO: boolean(string,symbol)*/
YCPBoolean TargetStoreRemove(const YCPString& root, const YCPSymbol&
kind_r);
@@ -714,13 +706,6 @@
/* TYPEINFO: boolean(integer)*/
YCPValue RemoveUpgradeRepo(const YCPInteger &repo);
- /* TYPEINFO: boolean(map<string,any>)*/
- YCPValue AddLock(const YCPMap &lock);
- /* TYPEINFO: list<map<string,any>>()*/
- YCPValue GetLocks();
- /* TYPEINFO: boolean(integer)*/
- YCPValue RemoveLock(const YCPInteger &lock_idx);
-
/* TYPEINFO: list<list<integer>>()*/
YCPValue PkgMediaSizes ();
/* TYPEINFO: list<list<integer>>()*/
@@ -755,10 +740,6 @@
// architecture related
/* TYPEINFO: string()*/
YCPValue GetArchitecture();
- /* TYPEINFO: boolean(string)*/
- YCPValue SetArchitecture(const YCPString &architecture);
- /* TYPEINFO: string()*/
- YCPValue SystemArchitecture();
/* TYPEINFO: boolean(string,symbol)*/
YCPValue ResolvableInstall( const YCPString& name_r, const YCPSymbol&
kind_r );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-pkg-bindings-4.0.13/src/Source_Create.cc
new/yast2-pkg-bindings-4.1.0/src/Source_Create.cc
--- old/yast2-pkg-bindings-4.0.13/src/Source_Create.cc 2018-07-04
17:29:34.000000000 +0200
+++ new/yast2-pkg-bindings-4.1.0/src/Source_Create.cc 2018-11-01
12:34:09.000000000 +0100
@@ -757,7 +757,7 @@
{
ids->add(YCPInteger(*it));
}
-
+
return ids;
}
}
@@ -776,7 +776,7 @@
try
{
- zypp::Url probe_url(url->value());
+ zypp::Url probe_url(ExpandedUrl(url)->asString()->value());
y2milestone("Probing repository type: '%s'...",
probe_url.asString().c_str());
// add the product directory
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-pkg-bindings-4.0.13/src/Target.cc
new/yast2-pkg-bindings-4.1.0/src/Target.cc
--- old/yast2-pkg-bindings-4.0.13/src/Target.cc 2018-07-04 17:29:34.000000000
+0200
+++ new/yast2-pkg-bindings-4.1.0/src/Target.cc 2018-11-01 12:34:09.000000000
+0100
@@ -158,29 +158,6 @@
/**
- @builtin TargetFileHasOwner
-
- @short returns true if the file is owned by a package
- @param string filepath
- @return boolean
-*/
-
-YCPBoolean
-PkgFunctions::TargetFileHasOwner (const YCPString& filepath)
-{
- try
- {
- return YCPBoolean
(!zypp_ptr()->target()->whoOwnsFile(filepath->value()).empty());
- }
- catch (...)
- {
- }
-
- return YCPBoolean(false);
-}
-
-
-/**
@builtin TargetStoreRemove
@short remove all resolvables from the DB in the target system (removes
only metadata in the package manager!)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-pkg-bindings-4.0.13/src/Target_DU.cc
new/yast2-pkg-bindings-4.1.0/src/Target_DU.cc
--- old/yast2-pkg-bindings-4.0.13/src/Target_DU.cc 2018-07-04
17:29:34.000000000 +0200
+++ new/yast2-pkg-bindings-4.1.0/src/Target_DU.cc 2018-11-01
12:34:09.000000000 +0100
@@ -117,24 +117,6 @@
return YCPInteger (avail);
}
-/** ------------------------
- *
- * @builtin TargetBlockSize
- *
- * @short Return block size of partition at directory
- * @param string directory
- * @return integer
- *
- */
-YCPInteger
-PkgFunctions::TargetBlockSize (const YCPString& dir)
-{
- long long used, size, bsize, avail;
- get_disk_stats (dir->value().c_str(), &used, &size, &bsize, &avail);
-
- return YCPInteger (bsize);
-}
-
// helper funtion
// initialize the disk usage counter with the current values from the system
void PkgFunctions::SetCurrentDU()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-pkg-bindings-4.0.13/src/Target_Load.cc
new/yast2-pkg-bindings-4.1.0/src/Target_Load.cc
--- old/yast2-pkg-bindings-4.0.13/src/Target_Load.cc 2018-07-04
17:29:34.000000000 +0200
+++ new/yast2-pkg-bindings-4.1.0/src/Target_Load.cc 2018-11-01
12:34:09.000000000 +0100
@@ -126,19 +126,6 @@
/** ------------------------
*
- * @builtin TargetRebuildInit
- * @short Similar to TargetInit, but the RPM DB is rebuilt ('rpm --rebuilddb')
before reading it
- * @param string root Root Directory
- * @return boolean
- */
-YCPValue
-PkgFunctions::TargetRebuildInit(const YCPString& root)
-{
- return TargetInitInternal(root, true);
-}
-
-/** ------------------------
- *
* @builtin TargetInitialize
* @short Initialize Target, read the keys.
* @param string root Root Directory
