Hello community, here is the log from the commit of package libsolv for openSUSE:Factory checked in at 2018-03-29 11:47:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libsolv (Old) and /work/SRC/openSUSE:Factory/.libsolv.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libsolv" Thu Mar 29 11:47:39 2018 rev:64 rq:590637 version:0.6.34 Changes: -------- --- /work/SRC/openSUSE:Factory/libsolv/libsolv.changes 2018-03-14 19:21:37.154316148 +0100 +++ /work/SRC/openSUSE:Factory/.libsolv.new/libsolv.changes 2018-03-29 11:47:47.123300291 +0200 @@ -1,0 +2,7 @@ +Fri Mar 23 12:02:08 CET 2018 - [email protected] + +- make sure product files come from /etc/products.d in fallback + search [bnc#1086602] +- bump version to 0.6.34 + +------------------------------------------------------------------- Old: ---- libsolv-0.6.33.tar.bz2 New: ---- libsolv-0.6.34.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libsolv.spec ++++++ --- /var/tmp/diff_new_pack.yZmwkn/_old 2018-03-29 11:47:48.179262242 +0200 +++ /var/tmp/diff_new_pack.yZmwkn/_new 2018-03-29 11:47:48.183262098 +0200 @@ -17,7 +17,7 @@ Name: libsolv -Version: 0.6.33 +Version: 0.6.34 Release: 0 Url: https://github.com/openSUSE/libsolv Source: libsolv-%{version}.tar.bz2 ++++++ libsolv-0.6.33.tar.bz2 -> libsolv-0.6.34.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsolv-0.6.33/NEWS new/libsolv-0.6.34/NEWS --- old/libsolv-0.6.33/NEWS 2018-02-28 16:32:40.000000000 +0100 +++ new/libsolv-0.6.34/NEWS 2018-03-23 12:08:13.000000000 +0100 @@ -2,6 +2,10 @@ This file contains the major changes between libsolv versions: +Version 0.6.34 +- new features: + * also look at suggests for package ordering + Version 0.6.33 - new features: * new Selection.clone() method in the bindings diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsolv-0.6.33/VERSION.cmake new/libsolv-0.6.34/VERSION.cmake --- old/libsolv-0.6.33/VERSION.cmake 2018-02-28 16:32:40.000000000 +0100 +++ new/libsolv-0.6.34/VERSION.cmake 2018-03-23 12:08:13.000000000 +0100 @@ -49,5 +49,5 @@ SET(LIBSOLV_MAJOR "0") SET(LIBSOLV_MINOR "6") -SET(LIBSOLV_PATCH "33") +SET(LIBSOLV_PATCH "34") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsolv-0.6.33/package/libsolv.changes new/libsolv-0.6.34/package/libsolv.changes --- old/libsolv-0.6.33/package/libsolv.changes 2018-03-01 11:06:18.000000000 +0100 +++ new/libsolv-0.6.34/package/libsolv.changes 2018-03-23 12:08:13.000000000 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Mar 23 12:02:08 CET 2018 - [email protected] + +- make sure product files come from /etc/products.d in fallback + search [bnc#1086602] +- bump version to 0.6.34 + +------------------------------------------------------------------- Thu Mar 1 10:52:23 CET 2018 - [email protected] - also use suggests for ordering packages [bnc#1077635] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsolv-0.6.33/src/linkedpkg.c new/libsolv-0.6.34/src/linkedpkg.c --- old/libsolv-0.6.33/src/linkedpkg.c 2017-10-10 12:39:51.000000000 +0200 +++ new/libsolv-0.6.34/src/linkedpkg.c 2018-03-23 12:08:13.000000000 +0100 @@ -192,16 +192,25 @@ /* oh no! Look up reference file */ Dataiterator di; const char *refbasename = solvable_lookup_str(s, PRODUCT_REFERENCEFILE); - dataiterator_init(&di, pool, s->repo, 0, SOLVABLE_FILELIST, refbasename, SEARCH_STRING); - while (dataiterator_step(&di)) - queue_push(qr, di.solvid); - dataiterator_free(&di); - if (qp) + if (refbasename) { - dataiterator_init(&di, pool, s->repo, 0, PRODUCT_REFERENCEFILE, refbasename, SEARCH_STRING); + dataiterator_init(&di, pool, s->repo, 0, SOLVABLE_FILELIST, refbasename, SEARCH_STRING); while (dataiterator_step(&di)) - queue_push(qp, di.solvid); + { + if (di.key->type != REPOKEY_TYPE_DIRSTRARRAY) + continue; + if (strcmp(repodata_dir2str(di.data, di.kv.id, 0), "/etc/products.d") != 0) + continue; + queue_push(qr, di.solvid); + } dataiterator_free(&di); + if (qp) + { + dataiterator_init(&di, pool, s->repo, 0, PRODUCT_REFERENCEFILE, refbasename, SEARCH_STRING); + while (dataiterator_step(&di)) + queue_push(qp, di.solvid); + dataiterator_free(&di); + } } } else if (qp)
