Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package yast2-pkg-bindings for openSUSE:Factory checked in at 2021-02-01 14:41:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-pkg-bindings (Old) and /work/SRC/openSUSE:Factory/.yast2-pkg-bindings.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-pkg-bindings" Mon Feb 1 14:41:23 2021 rev:217 rq:867496 version:4.3.8 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-pkg-bindings/yast2-pkg-bindings.changes 2021-01-15 19:44:28.137862836 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-pkg-bindings.new.28504/yast2-pkg-bindings.changes 2021-02-01 14:41:25.720644136 +0100 @@ -1,0 +2,14 @@ +Thu Jan 28 12:50:29 UTC 2021 - Ladislav Slez��k <lslezak@suse.cz> + +- Log more details about the newly added repositories + (for debugging bsc#1181344) +- 4.3.8 + +------------------------------------------------------------------- +Fri Jan 22 17:21:15 UTC 2021 - Ladislav Slez��k <lslezak@suse.cz> + +- Allow filtering resolvables by RPM path, return RPM path + for the product packages (related to bsc#1178688, bsc#1176276) +- 4.3.7 + +------------------------------------------------------------------- Old: ---- yast2-pkg-bindings-4.3.6.tar.bz2 New: ---- yast2-pkg-bindings-4.3.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-pkg-bindings-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.6ww0xH/_old 2021-02-01 14:41:26.280644939 +0100 +++ /var/tmp/diff_new_pack.6ww0xH/_new 2021-02-01 14:41:26.284644945 +0100 @@ -17,7 +17,7 @@ Name: yast2-pkg-bindings-devel-doc -Version: 4.3.6 +Version: 4.3.8 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-pkg-bindings-%{version}.tar.bz2 ++++++ yast2-pkg-bindings.spec ++++++ --- /var/tmp/diff_new_pack.6ww0xH/_old 2021-02-01 14:41:26.304644974 +0100 +++ /var/tmp/diff_new_pack.6ww0xH/_new 2021-02-01 14:41:26.304644974 +0100 @@ -17,7 +17,7 @@ Name: yast2-pkg-bindings -Version: 4.3.6 +Version: 4.3.8 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-pkg-bindings-4.3.6.tar.bz2 -> yast2-pkg-bindings-4.3.8.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-4.3.6/.github/workflows/ci.yml new/yast2-pkg-bindings-4.3.8/.github/workflows/ci.yml --- old/yast2-pkg-bindings-4.3.6/.github/workflows/ci.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-pkg-bindings-4.3.8/.github/workflows/ci.yml 2021-01-28 15:03:16.000000000 +0100 @@ -0,0 +1,34 @@ + +# See https://docs.github.com/en/actions/reference/workflow-syntax-for-github-acti... + +name: CI + +on: [push, pull_request] + +jobs: + Package: + runs-on: ubuntu-latest + container: registry.opensuse.org/yast/head/containers/yast-cpp:latest + + steps: + + - name: Git Checkout + uses: actions/checkout@v2 + + - name: Install Dependencies + run: rake build_dependencies:install + + - name: Inspect Installed Packages + run: rpm -qa | sort + + - name: Package Build + run: yast-ci-cpp + + - name: Install Smoke Test Requirements + run: zypper --non-interactive in --no-recommends yast2-ruby-bindings + + - name: Smoke Test Preparation + run: sh smoke_test_prepare.sh + + - name: Smoke Test Run + run: ruby smoke_test_run.rb diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-4.3.6/.github/workflows/surge.yml new/yast2-pkg-bindings-4.3.8/.github/workflows/surge.yml --- old/yast2-pkg-bindings-4.3.6/.github/workflows/surge.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-pkg-bindings-4.3.8/.github/workflows/surge.yml 2021-01-28 15:03:16.000000000 +0100 @@ -0,0 +1,36 @@ + +# See https://docs.github.com/en/actions/reference/workflow-syntax-for-github-acti... + +name: Surge + +on: + push: + branches: + # publish only the latest changes to master + - master + + +jobs: + publish: + runs-on: ubuntu-latest + container: registry.opensuse.org/yast/head/containers/yast-cpp:latest + + steps: + + - name: Git Checkout + uses: actions/checkout@v2 + + - name: Prepare + run: | + zypper in -y npm doxygen + npm install --global surge + + - name: Generate Doc + run: rake doc + + - name: Surge + run: surge --project ./autodocs/html --domain yast-pkg-bindings.surge.sh + env: + SURGE_LOGIN: ${{ secrets.SURGE_LOGIN }} + SURGE_TOKEN: ${{ secrets.SURGE_TOKEN }} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-4.3.6/.travis.yml new/yast2-pkg-bindings-4.3.8/.travis.yml --- old/yast2-pkg-bindings-4.3.6/.travis.yml 2021-01-11 08:50:23.000000000 +0100 +++ new/yast2-pkg-bindings-4.3.8/.travis.yml 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +0,0 @@ -sudo: required -language: bash -services: - - docker - -before_install: - - docker build -t yast-pkg-bindings-image . -script: - # the "yast-travis-cpp" script is included in the base yastdevel/cpp image - # see https://github.com/yast/docker-yast-cpp/blob/master/yast-travis-cpp - # run additional smoke tests to check the basic functionality - - docker run -it --privileged yast-pkg-bindings-image bash -c "yast-travis-cpp && ./smoke_test_prepare.sh && ./smoke_test_run.rb" - -after_success: - - ./.surge.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-4.3.6/Dockerfile new/yast2-pkg-bindings-4.3.8/Dockerfile --- old/yast2-pkg-bindings-4.3.6/Dockerfile 2021-01-11 08:50:23.000000000 +0100 +++ new/yast2-pkg-bindings-4.3.8/Dockerfile 1970-01-01 01:00:00.000000000 +0100 @@ -1,5 +0,0 @@ -FROM registry.opensuse.org/yast/head/containers/yast-cpp:latest -RUN zypper --gpg-auto-import-keys --non-interactive in --no-recommends \ - libzypp-devel yast2-ruby-bindings iproute2 -COPY . /usr/src/app - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-4.3.6/README.md new/yast2-pkg-bindings-4.3.8/README.md --- old/yast2-pkg-bindings-4.3.6/README.md 2021-01-11 08:50:23.000000000 +0100 +++ new/yast2-pkg-bindings-4.3.8/README.md 2021-01-28 15:03:16.000000000 +0100 @@ -1,7 +1,9 @@ ## YaST - Package Bindings -[](https://travis-ci.org/yast/yast-pkg-bindings) -[](https://ci.opensuse.org/view/Yast/job/yast-pkg-bindings-master/) +[]( +https://github.com/yast/yast-pkg-bindings/actions?query=branch%3Amaster) +[]( +https://ci.opensuse.org/view/Yast/job/yast-yast-pkg-bindings-master/) Online documentation is available at [yast-pkg-bindings.surge.sh/](https://yast-pkg-bindings.surge.sh/) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-4.3.6/package/yast2-pkg-bindings-devel-doc.spec new/yast2-pkg-bindings-4.3.8/package/yast2-pkg-bindings-devel-doc.spec --- old/yast2-pkg-bindings-4.3.6/package/yast2-pkg-bindings-devel-doc.spec 2021-01-11 08:50:23.000000000 +0100 +++ new/yast2-pkg-bindings-4.3.8/package/yast2-pkg-bindings-devel-doc.spec 2021-01-28 15:03:16.000000000 +0100 @@ -16,7 +16,7 @@ # Name: yast2-pkg-bindings-devel-doc -Version: 4.3.6 +Version: 4.3.8 Release: 0 License: GPL-2.0-only Group: Documentation/HTML diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-4.3.6/package/yast2-pkg-bindings.changes new/yast2-pkg-bindings-4.3.8/package/yast2-pkg-bindings.changes --- old/yast2-pkg-bindings-4.3.6/package/yast2-pkg-bindings.changes 2021-01-11 08:50:23.000000000 +0100 +++ new/yast2-pkg-bindings-4.3.8/package/yast2-pkg-bindings.changes 2021-01-28 15:03:16.000000000 +0100 @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Thu Jan 28 12:50:29 UTC 2021 - Ladislav Slez��k <lslezak@suse.cz> + +- Log more details about the newly added repositories + (for debugging bsc#1181344) +- 4.3.8 + +------------------------------------------------------------------- +Fri Jan 22 17:21:15 UTC 2021 - Ladislav Slez��k <lslezak@suse.cz> + +- Allow filtering resolvables by RPM path, return RPM path + for the product packages (related to bsc#1178688, bsc#1176276) +- 4.3.7 + +------------------------------------------------------------------- Fri Jan 8 11:12:53 UTC 2021 - Ladislav Slez��k <lslezak@suse.cz> - Fixed repository refresh (a bug caused downloading only the index diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-4.3.6/package/yast2-pkg-bindings.spec new/yast2-pkg-bindings-4.3.8/package/yast2-pkg-bindings.spec --- old/yast2-pkg-bindings-4.3.6/package/yast2-pkg-bindings.spec 2021-01-11 08:50:23.000000000 +0100 +++ new/yast2-pkg-bindings-4.3.8/package/yast2-pkg-bindings.spec 2021-01-28 15:03:16.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-pkg-bindings -Version: 4.3.6 +Version: 4.3.8 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-4.3.6/src/Resolvable_Properties.cc new/yast2-pkg-bindings-4.3.8/src/Resolvable_Properties.cc --- old/yast2-pkg-bindings-4.3.6/src/Resolvable_Properties.cc 2021-01-11 08:50:23.000000000 +0100 +++ new/yast2-pkg-bindings-4.3.8/src/Resolvable_Properties.cc 2021-01-28 15:03:16.000000000 +0100 @@ -499,6 +499,23 @@ } } + if (all || attrs->contains(YCPSymbol("path"))) + { + // get the reference package + zypp::sat::Solvable refsolvable = product->referencePackage(); + + if (refsolvable != zypp::sat::Solvable::noSolvable) + { + // create a package pointer from the SAT solvable + zypp::Package::Ptr refpkg(zypp::make<zypp::Package>(refsolvable)); + + if (refpkg) + { + ADD_STRING("path", refpkg->location().filename().asString()); + } + } + } + if (all || attrs->contains(YCPSymbol("product_file"))) { if (product_file.empty()) @@ -851,6 +868,10 @@ repo = source_value->asInteger()->value(); } + YCPValue path_value = attributes->value(YCPSymbol("path")); + if (!path_value.isNull() && path_value->isString()) + path = path_value->asString()->value(); + YCPValue medium_nr_value = attributes->value(YCPSymbol("medium_nr")); if (!medium_nr_value.isNull() && medium_nr_value->isInteger()) medium_nr = medium_nr_value->asInteger()->value(); @@ -950,6 +971,32 @@ if (!name.empty() && name != r->name()) return false; + // check the path + if (!path.empty()) + { + // the path is only available for Packages... + zypp::Package::constPtr pkg = zypp::asKind<zypp::Package>(r.resolvable()); + if (pkg && pkg->location().filename().asString() != path) + return false; + + // ... or Products (it's reference Package) + zypp::Product::constPtr product = zypp::asKind<zypp::Product>(r.resolvable()); + if (product) + { + // get the reference package + zypp::sat::Solvable refsolvable = product->referencePackage(); + + if (refsolvable != zypp::sat::Solvable::noSolvable) + { + // create a package pointer from the SAT solvable + zypp::Package::Ptr refpkg(zypp::make<zypp::Package>(refsolvable)); + + if (refpkg && refpkg->location().filename().asString() != path) + return false; + } + } + } + // check the version if (!version_str.empty() && version_str != r->edition().asString()) return false; @@ -1037,7 +1084,7 @@ // reference to PkgFunctions, we need to call PkgFunctions::logFindAlias() const PkgFunctions &pkg; - std::string kind, name, status_str, transact_by_str, arch_str, version_str; + std::string kind, name, status_str, transact_by_str, arch_str, version_str, path; bool check_repo; PkgFunctions::RepoId repo; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-4.3.6/src/Source_Create.cc new/yast2-pkg-bindings-4.3.8/src/Source_Create.cc --- old/yast2-pkg-bindings-4.3.6/src/Source_Create.cc 2021-01-11 08:50:23.000000000 +0100 +++ new/yast2-pkg-bindings-4.3.8/src/Source_Create.cc 2021-01-28 15:03:16.000000000 +0100 @@ -30,6 +30,7 @@ #include <PkgFunctions.h> #include <PkgProgress.h> #include "log.h" +#include <y2util/Y2SLog.h> #include <HelpTexts.h> @@ -278,7 +279,9 @@ // set packages path repo.setPackagesPath(repomanager->packagesPath(repo)); - y2milestone("Adding source '%s' (%s, dir: %s)", repo.alias().c_str(), url.asString().c_str(), path_r.asString().c_str()); + MIL << "Adding repository:" << std::endl; + MIL << repo << std::endl; + // note: exceptions should be caught by the calling code RefreshWithCallbacks(repo, subprogrcv_ref); progress.NextStage(); @@ -498,6 +501,9 @@ repo.setPackagesPath(repomanager->packagesPath(repo)); + MIL << "Adding repository:" << std::endl; + MIL << repo << std::endl; + repos.push_back(new YRepo(repo)); // the new source is at the end of the list