Merge branch 'main' into opensuse

Author: danigm

.github/workflows/codeql.yml

@@ -22,18 +22,18 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@7211b7c8077ea37d8641b6271f6a365a22a5fbfa # v4.36.0
+        uses: github/codeql-action/init@5595ccaf912efad79be6eef63a5619ff05969be3 # v4.37.6
         with:
           languages: ${{ matrix.language }}
           queries: +security-and-quality
 
       - name: Autobuild
-        uses: github/codeql-action/autobuild@7211b7c8077ea37d8641b6271f6a365a22a5fbfa # v4.36.0
+        uses: github/codeql-action/autobuild@5595ccaf912efad79be6eef63a5619ff05969be3 # v4.37.6
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@7211b7c8077ea37d8641b6271f6a365a22a5fbfa # v4.36.0
+        uses: github/codeql-action/analyze@5595ccaf912efad79be6eef63a5619ff05969be3 # v4.37.6
         with:
           category: "/language:${{ matrix.language }}"

.github/workflows/main.yml

@@ -112,11 +112,9 @@ jobs:
         if: matrix.build-type == 'no-optional-deps'
       - run: pipx install coveralls
       - run: pipx install pyupgrade
-      - run: pipx install ruff
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       - run: pytest
       - run: flake8
-      - run: /github/home/.local/bin/ruff check .
       - run: find . -not -path "./test/files/*" -name '*.py' | xargs /github/home/.local/bin/pyupgrade --py38-plus
       - run: python3 -m cProfile -o profile.stats lint.py -V test/source/* test/binary/* > /dev/null
       - run: python3 test/dump_stats.py profile.stats

.packit/rpmlint.spec

@@ -1,7 +1,7 @@
 %{!?python3: %global python3 %{__python3}}
 
 Name:           rpmlint
-Version:        2.9.0
+Version:        2.10.0
 Release:        0%{?dist}
 Summary:        Tool for checking common errors in RPM packages
 

pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rpmlint"
-version = "2.9.0"
+version = "2.10.0"
 description = "Check for common errors in RPM packages"
 license = {text = "License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)"}
 authors = [

rpmlint/checks/ErlangCheck.py

@@ -20,14 +20,24 @@ def check_file(self, pkg, filename):
                 self.output.add_info('W', pkg, 'beam-compile-info-missed', filename)
                 return
 
-            compile_state = byte_to_string(beam.compileinfo['source'])
-            if 'debug_info' not in beam.compileinfo['options']:
+            # Beams compiled with the 'deterministic' option omit the
+            # 'source' and 'options' entries from the compile info. For
+            # those, fall back to the presence of the debug info chunk.
+            options = beam.compileinfo.get('options')
+            if options is None:
+                has_debug_info = beam.selectChunkByName(b'Dbgi') is not None
+            else:
+                has_debug_info = 'debug_info' in options
+            if not has_debug_info:
                 self.output.add_info('E', pkg, 'beam-compiled-without-debuginfo', filename)
 
             # This can't be an error as builddir can be user specific and vary between users
             # it could be error in OBS where all the builds are done by user abuild, not in
             # general.
-            if not self.source_re.match(compile_state):
-                self.output.add_info('W', pkg, 'beam-was-not-recompiled', filename, compile_state)
+            source = beam.compileinfo.get('source')
+            if source is not None:
+                compile_state = byte_to_string(source)
+                if not self.source_re.match(compile_state):
+                    self.output.add_info('W', pkg, 'beam-was-not-recompiled', filename, compile_state)
         except Exception:
             self.output.add_info('E', pkg, 'pybeam-failed', filename)