Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package rpmconf for openSUSE:Factory checked in at 2022-12-06 14:23:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rpmconf (Old) and /work/SRC/openSUSE:Factory/.rpmconf.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rpmconf" Tue Dec 6 14:23:58 2022 rev:14 rq:1040465 version:1.1.8 Changes: -------- --- /work/SRC/openSUSE:Factory/rpmconf/rpmconf.changes 2021-11-23 22:13:26.578307904 +0100 +++ /work/SRC/openSUSE:Factory/.rpmconf.new.1835/rpmconf.changes 2022-12-06 14:24:14.602070831 +0100 @@ -1,0 +2,7 @@ +Mon Dec 5 21:52:40 UTC 2022 - Dirk Müller <[email protected]> + +- update to 1.1.8: + * change wording to avoid confusion + * avoid loops during clean action + +------------------------------------------------------------------- Old: ---- rpmconf-1.1.4.tar.gz New: ---- rpmconf-1.1.8.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpmconf.spec ++++++ --- /var/tmp/diff_new_pack.1lqADn/_old 2022-12-06 14:24:15.122075264 +0100 +++ /var/tmp/diff_new_pack.1lqADn/_new 2022-12-06 14:24:15.126075298 +0100 @@ -1,7 +1,7 @@ # # spec file for package rpmconf # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # 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: rpmconf -Version: 1.1.4 +Version: 1.1.8 Release: 0 Summary: Tool to handle rpmnew and rpmsave files License: GPL-3.0-or-later ++++++ rpmconf-1.1.4.tar.gz -> rpmconf-1.1.8.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmconf-rpmconf-1.1.4-1/.github/workflows/codeql-analysis.yml new/rpmconf-rpmconf-1.1.8-1/.github/workflows/codeql-analysis.yml --- old/rpmconf-rpmconf-1.1.4-1/.github/workflows/codeql-analysis.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/rpmconf-rpmconf-1.1.8-1/.github/workflows/codeql-analysis.yml 2022-11-30 16:57:14.000000000 +0100 @@ -0,0 +1,66 @@ +# For most projects, this workflow file will not need changing; you simply need +# to commit it to your repository. +# +# You may wish to alter this file to override the set of languages analyzed, +# or to provide custom queries or build logic. +# +# ******** NOTE ******** +# We have attempted to detect the languages in your repository. Please check +# the `language` matrix defined below to confirm you have the correct set of +# supported CodeQL languages. +# +name: "CodeQL" + +on: + push: + branches: [ main ] + pull_request: + # The branches below must be a subset of the branches above + branches: [ main ] + schedule: + - cron: '32 6 * * 5' + +jobs: + analyze: + name: Analyze + runs-on: ubuntu-latest + permissions: + actions: read + contents: read + security-events: write + + strategy: + fail-fast: false + matrix: + language: [ 'python' ] + # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ] + # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@v2 + with: + languages: ${{ matrix.language }} + # If you wish to specify custom queries, you can do so here or in a config file. + # By default, queries listed here will override any specified in a config file. + # Prefix the list here with "+" to use these queries and those in the config file. + # queries: ./path/to/local/query, your-org/your-repo/queries@main + + + # â¹ï¸ Command-line programs to run using the OS shell. + # ð See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun + + # âï¸ If the Autobuild fails above, remove it and uncomment the following three lines + # and modify them (or add more) to build your code if your project + # uses a compiled language + + #- run: | + # make bootstrap + # make release + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmconf-rpmconf-1.1.4-1/.tito/packages/rpmconf new/rpmconf-rpmconf-1.1.8-1/.tito/packages/rpmconf --- old/rpmconf-rpmconf-1.1.4-1/.tito/packages/rpmconf 2021-03-04 12:36:07.000000000 +0100 +++ new/rpmconf-rpmconf-1.1.8-1/.tito/packages/rpmconf 2022-11-30 16:57:14.000000000 +0100 @@ -1 +1 @@ -1.1.4-1 ./ +1.1.8-1 ./ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmconf-rpmconf-1.1.4-1/.tito/releasers.conf new/rpmconf-rpmconf-1.1.8-1/.tito/releasers.conf --- old/rpmconf-rpmconf-1.1.4-1/.tito/releasers.conf 2021-03-04 12:36:07.000000000 +0100 +++ new/rpmconf-rpmconf-1.1.8-1/.tito/releasers.conf 2022-11-30 16:57:14.000000000 +0100 @@ -1,14 +1,14 @@ [release] releaser = tito.release.FedoraGitReleaser -branches = master epel8 epel7 +branches = main epel8 epel7 [all] releaser = tito.release.FedoraGitReleaser -branches = master f32 f31 epel8 epel7 +branches = main f37 f36 f35 epel8 epel7 -[fedora-master] +[fedora-main] releaser = tito.release.FedoraGitReleaser -branches = master +branches = main [fedora-f22] releaser = tito.release.FedoraGitReleaser diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmconf-rpmconf-1.1.4-1/README.md new/rpmconf-rpmconf-1.1.8-1/README.md --- old/rpmconf-rpmconf-1.1.4-1/README.md 2021-03-04 12:36:07.000000000 +0100 +++ new/rpmconf-rpmconf-1.1.8-1/README.md 2022-11-30 16:57:14.000000000 +0100 @@ -72,6 +72,10 @@ cd source tito build --test --rpm +## Packaging status + + + ## History Originally there was no such tool for RPM world. I came from Debian world where handling diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmconf-rpmconf-1.1.4-1/rpmconf/rpmconf.py new/rpmconf-rpmconf-1.1.8-1/rpmconf/rpmconf.py --- old/rpmconf-rpmconf-1.1.4-1/rpmconf/rpmconf.py 2021-03-04 12:36:07.000000000 +0100 +++ new/rpmconf-rpmconf-1.1.8-1/rpmconf/rpmconf.py 2022-11-30 16:57:14.000000000 +0100 @@ -379,7 +379,7 @@ prompt = """ ==> Package distributor has shipped an updated version. What would you like to do about it ? Your options are: Y or I : install the package maintainer's version - N or O : keep your currently-installed version + N or O : keep your currently-installed version (and delete .rpmsave) D : show the differences between the versions M : merge configuration files Z : background this process to examine the situation @@ -494,7 +494,9 @@ def _clean_orphan(self): files_merge = [] files_delete = [] - excludes = self.exclude + [Path('/var/lib/mock')] + dirs_inodes = set() + excludes = self.exclude + [Path('/var/lib/mock'), Path('/var/run/'), + Path('/var/lib/docker'), Path('/var/lib/containers')] for topdir in ["/etc", "/var", "/usr"]: self.logger.info("Searching through: %s", topdir) if Path(topdir) in excludes: @@ -503,6 +505,15 @@ topdir = os.path.normpath(self.root + topdir) for root, dirs, files in os.walk(topdir, followlinks=True, topdown=True): dirs[:] = [d for d in dirs if Path(os.path.join(root, d)) not in excludes] + # lookup inodes number and check for duplicates to avoid infinite loops + scandirs = [] + for dirname in dirs: + st = os.stat(os.path.join(root, dirname)) + dirkey = st.st_dev, st.st_ino + if dirkey not in dirs_inodes: + dirs_inodes.add(dirkey) + scandirs.append(dirname) + dirs[:] = scandirs for name in files: l_name = os.path.join(root, name) if os.path.splitext(l_name)[1] in [".rpmnew", ".rpmsave"]: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmconf-rpmconf-1.1.4-1/rpmconf.spec new/rpmconf-rpmconf-1.1.8-1/rpmconf.spec --- old/rpmconf-rpmconf-1.1.4-1/rpmconf.spec 2021-03-04 12:36:07.000000000 +0100 +++ new/rpmconf-rpmconf-1.1.8-1/rpmconf.spec 2022-11-30 16:57:14.000000000 +0100 @@ -5,8 +5,8 @@ Name: rpmconf Summary: Tool to handle rpmnew and rpmsave files -License: GPLv3 -Version: 1.1.4 +License: GPL-3.0-only +Version: 1.1.8 Release: 1%{?dist} URL: https://github.com/xsuchy/rpmconf # source is created by: @@ -119,6 +119,28 @@ %dir %{_datadir}/rpmconf %changelog +* Wed Nov 30 2022 Miroslav Suchý <[email protected]> 1.1.8-1 +- use spdx license +- 2135035 - change wording to avoid confusion + +* Mon Oct 10 2022 Miroslav Suchý <[email protected]> 1.1.7-1.1 +- 133273] - avoid loops during clean action + +* Tue Oct 04 2022 msuchy <[email protected]> - 1.1.6-2.1 +- rebuilt + +* Tue Oct 04 2022 msuchy <[email protected]> - 1.1.6-1.1 +- rebuilt + +* Mon Aug 29 2022 Miroslav Suchý <[email protected]> 1.1.6-1 +- Automatic commit of package [rpmconf] release [1.1.5-1]. +- Create codeql-analysis.yml + +* Thu Aug 25 2022 Miroslav Suchý <[email protected]> 1.1.5-1 +- typo +- add distribution buttons +- master to main in releasers + * Thu Mar 04 2021 Miroslav Suchý <[email protected]> 1.1.4-1 - 1934986 - update link diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmconf-rpmconf-1.1.4-1/setup.py new/rpmconf-rpmconf-1.1.8-1/setup.py --- old/rpmconf-rpmconf-1.1.4-1/setup.py 2021-03-04 12:36:07.000000000 +0100 +++ new/rpmconf-rpmconf-1.1.8-1/setup.py 2022-11-30 16:57:14.000000000 +0100 @@ -4,7 +4,7 @@ setup(name = "rpmconf", packages = ["rpmconf"], - version = "1.1.4", + version = "1.1.8", description = "Handle rpmnew and rpmsave files", author = "Igor Gnatenko", author_email = "[email protected]",
