Hello community, here is the log from the commit of package yast2-pkg-bindings for openSUSE:Factory checked in at 2020-01-17 16:03:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-pkg-bindings (Old) and /work/SRC/openSUSE:Factory/.yast2-pkg-bindings.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-pkg-bindings" Fri Jan 17 16:03:01 2020 rev:208 rq:764676 version:4.2.5 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-pkg-bindings/yast2-pkg-bindings.changes 2019-12-14 12:04:35.907391322 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-pkg-bindings.new.26092/yast2-pkg-bindings.changes 2020-01-17 16:03:07.116375655 +0100 @@ -1,0 +2,7 @@ +Mon Jan 13 12:18:43 UTC 2020 - Petr Pavlu <[email protected]> + +- Fix calculation of replaced products in Pkg.Resolvable2YCPMap() + (bsc#1157202) +- 4.2.5 + +------------------------------------------------------------------- Old: ---- yast2-pkg-bindings-4.2.4.tar.bz2 New: ---- yast2-pkg-bindings-4.2.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-pkg-bindings-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.SHhhVR/_old 2020-01-17 16:03:07.896376024 +0100 +++ /var/tmp/diff_new_pack.SHhhVR/_new 2020-01-17 16:03:07.900376026 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-pkg-bindings-devel-doc # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: yast2-pkg-bindings-devel-doc -Version: 4.2.4 +Version: 4.2.5 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-pkg-bindings-%{version}.tar.bz2 ++++++ yast2-pkg-bindings.spec ++++++ --- /var/tmp/diff_new_pack.SHhhVR/_old 2020-01-17 16:03:07.916376033 +0100 +++ /var/tmp/diff_new_pack.SHhhVR/_new 2020-01-17 16:03:07.920376035 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-pkg-bindings # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: yast2-pkg-bindings -Version: 4.2.4 +Version: 4.2.5 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-pkg-bindings-4.2.4.tar.bz2 -> yast2-pkg-bindings-4.2.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-4.2.4/Doxyfile new/yast2-pkg-bindings-4.2.5/Doxyfile --- old/yast2-pkg-bindings-4.2.4/Doxyfile 2019-12-12 17:01:45.000000000 +0100 +++ new/yast2-pkg-bindings-4.2.5/Doxyfile 2020-01-15 14:41:27.000000000 +0100 @@ -1004,7 +1004,7 @@ # also VERBATIM_HEADERS is set to NO. # The default value is: NO. -SOURCE_BROWSER = NO +SOURCE_BROWSER = YES # Setting the INLINE_SOURCES tag to YES will include the body of functions, # classes and enums directly into the documentation. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-4.2.4/package/yast2-pkg-bindings-devel-doc.spec new/yast2-pkg-bindings-4.2.5/package/yast2-pkg-bindings-devel-doc.spec --- old/yast2-pkg-bindings-4.2.4/package/yast2-pkg-bindings-devel-doc.spec 2019-12-12 17:01:45.000000000 +0100 +++ new/yast2-pkg-bindings-4.2.5/package/yast2-pkg-bindings-devel-doc.spec 2020-01-15 14:41:27.000000000 +0100 @@ -16,7 +16,7 @@ # Name: yast2-pkg-bindings-devel-doc -Version: 4.2.4 +Version: 4.2.5 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.2.4/package/yast2-pkg-bindings.changes new/yast2-pkg-bindings-4.2.5/package/yast2-pkg-bindings.changes --- old/yast2-pkg-bindings-4.2.4/package/yast2-pkg-bindings.changes 2019-12-12 17:01:45.000000000 +0100 +++ new/yast2-pkg-bindings-4.2.5/package/yast2-pkg-bindings.changes 2020-01-15 14:41:27.000000000 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Jan 13 12:18:43 UTC 2020 - Petr Pavlu <[email protected]> + +- Fix calculation of replaced products in Pkg.Resolvable2YCPMap() + (bsc#1157202) +- 4.2.5 + +------------------------------------------------------------------- Thu Dec 12 15:52:08 UTC 2019 - Imobach Gonzalez Sosa <[email protected]> - Include the "deps" resolvable property even when it is empty diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-4.2.4/package/yast2-pkg-bindings.spec new/yast2-pkg-bindings-4.2.5/package/yast2-pkg-bindings.spec --- old/yast2-pkg-bindings-4.2.4/package/yast2-pkg-bindings.spec 2019-12-12 17:01:45.000000000 +0100 +++ new/yast2-pkg-bindings-4.2.5/package/yast2-pkg-bindings.spec 2020-01-15 14:41:27.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-pkg-bindings -Version: 4.2.4 +Version: 4.2.5 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-4.2.4/src/Keyring.cc new/yast2-pkg-bindings-4.2.5/src/Keyring.cc --- old/yast2-pkg-bindings-4.2.4/src/Keyring.cc 2019-12-12 17:01:45.000000000 +0100 +++ new/yast2-pkg-bindings-4.2.5/src/Keyring.cc 2020-01-15 14:41:27.000000000 +0100 @@ -39,7 +39,7 @@ Textdomain "pkg-bindings" */ -/**************************************************************************************** +/** * @builtin ImportGPGKey * @short Import a GPG key into the keyring * @description @@ -101,7 +101,7 @@ const bool trusted; }; -/**************************************************************************************** +/** * @builtin GPGKeys * @short Read the GPG keys in the package manager keyring * @description @@ -138,7 +138,7 @@ } } -/**************************************************************************************** +/** * @builtin DeleteGPGKey * @short Remove the GPG key from the package manager keyring * @description @@ -171,7 +171,7 @@ return YCPBoolean(ret); } -/**************************************************************************************** +/** * @builtin CheckGPGKeyFile * @short Check whether the file contains a valid GPG key * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-4.2.4/src/Package.cc new/yast2-pkg-bindings-4.2.5/src/Package.cc --- old/yast2-pkg-bindings-4.2.4/src/Package.cc 2019-12-12 17:01:45.000000000 +0100 +++ new/yast2-pkg-bindings-4.2.5/src/Package.cc 2020-01-15 14:41:27.000000000 +0100 @@ -186,7 +186,7 @@ /////////////////////////////////////////////////////////////////// -/****************************************************************** +/** ** ** ** FUNCTION NAME : join @@ -2875,7 +2875,7 @@ return langycplist; } -/**************************************************************************************** +/** * @builtin RpmChecksig * @short Check signature of RPM * @param string filename diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-4.2.4/src/Resolvable_Properties.cc new/yast2-pkg-bindings-4.2.5/src/Resolvable_Properties.cc --- old/yast2-pkg-bindings-4.2.4/src/Resolvable_Properties.cc 2019-12-12 17:01:45.000000000 +0100 +++ new/yast2-pkg-bindings-4.2.5/src/Resolvable_Properties.cc 2020-01-15 14:41:27.000000000 +0100 @@ -180,7 +180,7 @@ return ResolvablePropertiesEx (name, kind_r, version, true, false, YCPList()); } -/* +/** @builtin ResolvableDependencies @description return list of resolvables with dependencies @@ -406,13 +406,17 @@ rprod->add(YCPString("description"), YCPString(replacedProduct->description())); std::string product_summary = replacedProduct->summary(); - ADD_NOT_EMPTY_STRING("display_name", product_summary); + if (!product_summary.empty()) + rprod->add(YCPString("display_name"), YCPString(product_summary)); std::string product_shortname = replacedProduct->shortName(); - ADD_NOT_EMPTY_STRING("short_name", product_shortname) + if (!product_shortname.empty()) + rprod->add(YCPString("short_name"), YCPString(product_shortname)); // use summary for the short name if it's defined - else if (product_summary.size() > 0) + else if (!product_summary.empty()) rprod->add(YCPString("short_name"), YCPString(product_summary)); + + rep_prods->add(rprod); } info->add(YCPString("replaces"), rep_prods); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-4.2.4/src/Service.cc new/yast2-pkg-bindings-4.2.5/src/Service.cc --- old/yast2-pkg-bindings-4.2.4/src/Service.cc 2019-12-12 17:01:45.000000000 +0100 +++ new/yast2-pkg-bindings-4.2.5/src/Service.cc 2020-01-15 14:41:27.000000000 +0100 @@ -219,7 +219,7 @@ return ret; } -/****************************************************************************** +/** * @builtin ServiceURL * * @short Get full service URL (including password!) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-4.2.4/src/Source_Create.cc new/yast2-pkg-bindings-4.2.5/src/Source_Create.cc --- old/yast2-pkg-bindings-4.2.4/src/Source_Create.cc 2019-12-12 17:01:45.000000000 +0100 +++ new/yast2-pkg-bindings-4.2.5/src/Source_Create.cc 2020-01-15 14:41:27.000000000 +0100 @@ -311,7 +311,7 @@ return repos.size() - 1; } -/**************************************************************************************** +/** * @builtin RepositoryAdd * * @short Register a new repository @@ -501,7 +501,7 @@ return YCPInteger(repos.size() - 1); } -/**************************************************************************************** +/** * @builtin SourceCreate * * @short Create a Source @@ -516,7 +516,7 @@ * @param string url The media to scan. * @optarg string product_dir Restrict scan to a certain InstSrc located in media_url/product_dir. * - * @return integer The source_id of the first InstSrc found on the media. + * @return integer The source_id of the first InstSrc found on the media or `-1` if scan failed. **/ YCPValue PkgFunctions::SourceCreate (const YCPString& media, const YCPString& pd) @@ -762,7 +762,7 @@ } } -/**************************************************************************************** +/** * @builtin RepositoryProbe * * @short Probe type of the repository @@ -818,7 +818,7 @@ } -/**************************************************************************************** +/** * @builtin SourceScan * @short Scan a Source Media * @description @@ -835,7 +835,7 @@ * @param string url The media to scan. * @optarg string product_dir Restrict scan to a certain InstSrc located in media_url/product_dir. * - * @return list<integer> list of SrcIds (integer). + * @return list<integer> list of SrcIds (integer) or `-1` if scan failed. **/ YCPValue PkgFunctions::SourceScan (const YCPString& media, const YCPString& pd) @@ -844,7 +844,7 @@ return SourceCreateEx(media, pd, false, YCPString(""), true); } -/**************************************************************************************** +/** * @builtin RepositoryScan * * @short Scan available products in the repository diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-4.2.4/src/Source_Download.cc new/yast2-pkg-bindings-4.2.5/src/Source_Download.cc --- old/yast2-pkg-bindings-4.2.4/src/Source_Download.cc 2019-12-12 17:01:45.000000000 +0100 +++ new/yast2-pkg-bindings-4.2.5/src/Source_Download.cc 2020-01-15 14:41:27.000000000 +0100 @@ -177,7 +177,7 @@ } -/**************************************************************************************** +/** * @builtin SourceProvideFile * * @short Make a file available at the local filesystem @@ -197,7 +197,7 @@ return SourceProvideFileCommon(id, mid, f, false /*optional*/, false /* signed */, true /* digested, doesn't matter in this case*/); } -/**************************************************************************************** +/** * @builtin SourceProvideOptionalFile * * @short Make an optional file available at the local filesystem @@ -218,7 +218,7 @@ return SourceProvideFileCommon(id, mid, f, true /*optional*/, false /* signed */, true /* digested, doesn't matter in this case*/); } -/**************************************************************************************** +/** * @builtin SourceProvideSignedFile * * @short Make a signed file available at the local filesystem @@ -246,7 +246,7 @@ return SourceProvideFileCommon(id, mid, f, optional->value() /*optional*/, true /* signed */, false /* not digested = signed*/); } -/**************************************************************************************** +/** * @builtin SourceProvideDigestedFile * * @short Make a digested file available at the local filesystem @@ -274,7 +274,7 @@ return SourceProvideFileCommon(id, mid, f, optional->value() /*optional*/, true /* signed */, true /* digested */); } -/**************************************************************************************** +/** * @builtin SourceProvideDirectory * @short make a directory available at the local filesystem * @description @@ -296,7 +296,7 @@ return SourceProvideDirectoryInternal(id, mid, d, optional, recursive, false); } -/**************************************************************************************** +/** * @builtin SourceProvideSignedDirectory * @short make a directory available at the local filesystem * @description @@ -438,7 +438,7 @@ return YCPBoolean( true ); } -/**************************************************************************************** +/** * @builtin SourceRefreshNow * @short Attempt to immediately refresh a Source * @description @@ -456,7 +456,7 @@ return SourceRefreshHelper(id); } -/**************************************************************************************** +/** * @builtin SourceForceRefreshNow * @short Unconditionally refresh a Source * @description diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-4.2.4/src/Source_Get.cc new/yast2-pkg-bindings-4.2.5/src/Source_Get.cc --- old/yast2-pkg-bindings-4.2.4/src/Source_Get.cc 2019-12-12 17:01:45.000000000 +0100 +++ new/yast2-pkg-bindings-4.2.5/src/Source_Get.cc 2020-01-15 14:41:27.000000000 +0100 @@ -45,7 +45,7 @@ Textdomain "pkg-bindings" */ -/**************************************************************************************** +/** * @builtin SourceGetCurrent * * @short Return the list of all InstSrc Ids. @@ -96,7 +96,7 @@ // Query individual sources ///////////////////////////////////////////////////////////////////////////////////////// -/**************************************************************************************** +/** * @builtin SourceGeneralData * * @short Get general data about the source @@ -184,7 +184,7 @@ return data; } -/****************************************************************************** +/** * @builtin SourceURL * * @short Get full source URL, including password @@ -197,7 +197,7 @@ return GetSourceUrl(id, false); } -/****************************************************************************** +/** * @builtin SourceRawURL * * @short Get full source raw URL (no variable replacement), including password @@ -211,7 +211,7 @@ } -/**************************************************************************************** +/** * @builtin SourceMediaData * @short Return media data about the source * @description @@ -300,7 +300,7 @@ return data; } -/**************************************************************************************** +/** * @builtin SourceProductData * @short Return Product data about the source * @param integer SrcId Specifies the InstSrc to query. @@ -388,7 +388,7 @@ return ret; } -/**************************************************************************************** +/** * @builtin SourceEditGet * * @short Get state of Sources diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-4.2.4/src/Source_Installation.cc new/yast2-pkg-bindings-4.2.5/src/Source_Installation.cc --- old/yast2-pkg-bindings-4.2.4/src/Source_Installation.cc 2019-12-12 17:01:45.000000000 +0100 +++ new/yast2-pkg-bindings-4.2.5/src/Source_Installation.cc 2020-01-15 14:41:27.000000000 +0100 @@ -198,7 +198,7 @@ return true; } -/**************************************************************************************** +/** * @builtin SourceCacheCopyTo * * @short Copy cache data of all installation sources to the target @@ -265,7 +265,7 @@ return YCPBoolean(true); } -/**************************************************************************************** +/** * @builtin SourceMoveDownloadArea * * @short Move download area of CURL-based sources to specified directory diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-4.2.4/src/Source_Load.cc new/yast2-pkg-bindings-4.2.5/src/Source_Load.cc --- old/yast2-pkg-bindings-4.2.4/src/Source_Load.cc 2019-12-12 17:01:45.000000000 +0100 +++ new/yast2-pkg-bindings-4.2.5/src/Source_Load.cc 2020-01-15 14:41:27.000000000 +0100 @@ -38,7 +38,7 @@ Textdomain "pkg-bindings" */ -/**************************************************************************************** +/** * @builtin SourceRestore * * @short Restore the sources from the persistent store @@ -139,7 +139,7 @@ return YCPBoolean(success); } -/**************************************************************************************** +/** * @builtin SourceLoad * * @short Load resolvables from the installation sources @@ -467,7 +467,7 @@ } -/**************************************************************************************** +/** * @builtin SourceStartManager * * @short Start the source manager - restore the sources and load the resolvables @@ -505,7 +505,7 @@ return ret; } -/**************************************************************************************** +/** * Helper function * @short Start the source manager - restore the sources and load the resolvables * @description @@ -535,7 +535,7 @@ return success; } -/**************************************************************************************** +/** * @builtin SourceStartCache * * @short Make sure the InstSrcManager is up, and return the list of SrcIds. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-4.2.4/src/Source_Save.cc new/yast2-pkg-bindings-4.2.5/src/Source_Save.cc --- old/yast2-pkg-bindings-4.2.4/src/Source_Save.cc 2019-12-12 17:01:45.000000000 +0100 +++ new/yast2-pkg-bindings-4.2.5/src/Source_Save.cc 2020-01-15 14:41:27.000000000 +0100 @@ -38,7 +38,7 @@ Textdomain "pkg-bindings" */ -/**************************************************************************************** +/** * @builtin SourceReleaseAll * * @short Release all medias hold by all sources @@ -71,7 +71,7 @@ return YCPBoolean(ret); } -/****************************************************************************** +/** * @builtin SourceSaveAll * * @short Save all InstSrces. @@ -237,7 +237,7 @@ return YCPBoolean(ret); } -/**************************************************************************************** +/** * @builtin SourceFinishAll * * @short Release all instalation sources diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-4.2.4/src/Source_Set.cc new/yast2-pkg-bindings-4.2.5/src/Source_Set.cc --- old/yast2-pkg-bindings-4.2.4/src/Source_Set.cc 2019-12-12 17:01:45.000000000 +0100 +++ new/yast2-pkg-bindings-4.2.5/src/Source_Set.cc 2020-01-15 14:41:27.000000000 +0100 @@ -38,7 +38,7 @@ Textdomain "pkg-bindings" */ -/**************************************************************************************** +/** * @builtin SourceSetEnabled * * @short Set the default activation state of an InsrSrc. @@ -102,7 +102,7 @@ return YCPBoolean(success); } -/**************************************************************************************** +/** * @builtin SourceSetPriority * * @short Set the repository priority @@ -136,7 +136,7 @@ return YCPBoolean(true); } -/**************************************************************************************** +/** * @builtin SourceSetAutorefresh * * @short Set whether this source should automaticaly refresh it's @@ -158,7 +158,7 @@ return YCPBoolean( true ); } -/**************************************************************************************** +/** * @builtin SourceEditSet * * @short Configure properties of installation sources @@ -253,7 +253,7 @@ return YCPBoolean( !error ); } -/**************************************************************************************** +/** * @builtin SourceChangeUrl * @short Change Source URL * @description @@ -304,7 +304,7 @@ // ///////////////////////////////////////////////////////////////////////////////////////// -/**************************************************************************************** +/** * Pkg::SourceRaisePriority (integer SrcId) -> bool * * Raise priority of source. @@ -340,7 +340,7 @@ return YCPBoolean(true); } -/**************************************************************************************** +/** * Pkg::SourceLowerPriority (integer SrcId) -> void * * Lower priority of source. @@ -376,7 +376,7 @@ return YCPBoolean(true); } -/**************************************************************************************** +/** * @builtin SourceDelete * @short Delete a Source * @description diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-4.2.4/src/ycpTools.cc new/yast2-pkg-bindings-4.2.5/src/ycpTools.cc --- old/yast2-pkg-bindings-4.2.4/src/ycpTools.cc 2019-12-12 17:01:45.000000000 +0100 +++ new/yast2-pkg-bindings-4.2.5/src/ycpTools.cc 2020-01-15 14:41:27.000000000 +0100 @@ -78,7 +78,7 @@ return ret; } -/****************************************************************** +/** ** ** ** FUNCTION NAME : operator<< @@ -107,7 +107,7 @@ return str << " )"; } -/****************************************************************** +/** ** ** ** FUNCTION NAME : asString @@ -140,7 +140,7 @@ return stringutil::form( "YCPValueType(%d)", obj ); } -/****************************************************************** +/** ** ** ** FUNCTION NAME : operator<< @@ -151,7 +151,7 @@ return str << asString( obj ); } -/****************************************************************** +/** ** ** ** FUNCTION NAME : asString @@ -184,7 +184,7 @@ return stringutil::form( "YCPValue(%s)", asString( obj->valuetype() ).c_str() ); } -/****************************************************************** +/** ** ** ** FUNCTION NAME : operator<<
