Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package openSUSE-release-tools for
openSUSE:Factory checked in at 2022-02-25 21:25:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openSUSE-release-tools (Old)
and /work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.1958 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openSUSE-release-tools"
Fri Feb 25 21:25:13 2022 rev:384 rq:957555 version:20220225.970e958e
Changes:
--------
---
/work/SRC/openSUSE:Factory/openSUSE-release-tools/openSUSE-release-tools.changes
2022-02-24 18:24:41.374639164 +0100
+++
/work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.1958/openSUSE-release-tools.changes
2022-02-25 21:25:45.359645635 +0100
@@ -1,0 +2,6 @@
+Fri Feb 25 10:19:51 UTC 2022 - opensuse-releaset...@opensuse.org
+
+- Update to version 20220225.970e958e:
+ * pkglistgen: Also support zstd for weakremovers.inc
+
+-------------------------------------------------------------------
Old:
----
openSUSE-release-tools-20220224.e679863a.obscpio
New:
----
openSUSE-release-tools-20220225.970e958e.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openSUSE-release-tools.spec ++++++
--- /var/tmp/diff_new_pack.wLmOfE/_old 2022-02-25 21:25:46.247645793 +0100
+++ /var/tmp/diff_new_pack.wLmOfE/_new 2022-02-25 21:25:46.255645794 +0100
@@ -20,7 +20,7 @@
%define source_dir openSUSE-release-tools
%define announcer_filename factory-package-news
Name: openSUSE-release-tools
-Version: 20220224.e679863a
+Version: 20220225.970e958e
Release: 0
Summary: Tools to aid in staging and release work for openSUSE/SUSE
License: GPL-2.0-or-later AND MIT
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.wLmOfE/_old 2022-02-25 21:25:46.295645801 +0100
+++ /var/tmp/diff_new_pack.wLmOfE/_new 2022-02-25 21:25:46.299645803 +0100
@@ -1,7 +1,7 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/openSUSE/openSUSE-release-tools.git</param>
- <param
name="changesrevision">e679863a8859b710f28e3d3482258d66db70b9e5</param>
+ <param
name="changesrevision">33da10611b820017520c16f3102776a8f5bc8a90</param>
</service>
</servicedata>
++++++ openSUSE-release-tools-20220224.e679863a.obscpio ->
openSUSE-release-tools-20220225.970e958e.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20220224.e679863a/pkglistgen/file_utils.py
new/openSUSE-release-tools-20220225.970e958e/pkglistgen/file_utils.py
--- old/openSUSE-release-tools-20220224.e679863a/pkglistgen/file_utils.py
2022-02-24 15:09:15.000000000 +0100
+++ new/openSUSE-release-tools-20220225.970e958e/pkglistgen/file_utils.py
2022-02-25 11:19:10.000000000 +0100
@@ -2,6 +2,9 @@
import os
import os.path
import shutil
+import solv
+import tempfile
+import subprocess
from lxml import etree as ET
@@ -60,3 +63,19 @@
if os.path.isfile(name_path):
os.unlink(name_path)
+
+
+def add_susetags(pool, file):
+ oldsysrepo = pool.add_repo(file)
+ defvendorid = oldsysrepo.meta.lookup_id(solv.SUSETAGS_DEFAULTVENDOR)
+ f = tempfile.TemporaryFile()
+ if file.endswith('.xz'):
+ subprocess.call(['xz', '-cd', file], stdout=f.fileno())
+ elif file.endswith('.zst'):
+ subprocess.call(['zstd', '-cd', file], stdout=f.fileno())
+ else:
+ raise Exception("unsupported " + file)
+ os.lseek(f.fileno(), 0, os.SEEK_SET)
+ oldsysrepo.add_susetags(solv.xfopen_fd(None, f.fileno()), defvendorid,
None,
+ solv.Repo.REPO_NO_INTERNALIZE |
solv.Repo.SUSETAGS_RECORD_SHARES)
+ return oldsysrepo
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20220224.e679863a/pkglistgen/tool.py
new/openSUSE-release-tools-20220225.970e958e/pkglistgen/tool.py
--- old/openSUSE-release-tools-20220224.e679863a/pkglistgen/tool.py
2022-02-24 15:09:15.000000000 +0100
+++ new/openSUSE-release-tools-20220225.970e958e/pkglistgen/tool.py
2022-02-25 11:19:10.000000000 +0100
@@ -7,7 +7,6 @@
import shutil
import subprocess
import yaml
-import tempfile
from lxml import etree as ET
@@ -405,22 +404,17 @@
# cast 15.1 to string :)
key = str(key)
- oldrepos = set(glob.glob(os.path.join(directory,
'{}_*.packages.xz'.format(key))))
- oldrepos |= set(glob.glob(os.path.join(directory,
'{}.packages.xz'.format(key))))
+ oldrepos = set()
+ for suffix in ['xz', 'zst']:
+ oldrepos |= set(glob.glob(os.path.join(directory,
f"{key}_*.packages.{suffix}")))
+ oldrepos |= set(glob.glob(os.path.join(directory,
f"{key}.packages.{suffix}")))
for oldrepo in sorted(oldrepos):
pool = solv.Pool()
pool.setarch()
# we need some progress in the debug output - or gocd gets
nervous
self.logger.debug('checking {}'.format(oldrepo))
- oldsysrepo = pool.add_repo(oldrepo)
- defvendorid =
oldsysrepo.meta.lookup_id(solv.SUSETAGS_DEFAULTVENDOR)
- f = tempfile.TemporaryFile()
- # FIXME: port to lzma module with python3
- subprocess.call(['xz', '-cd', oldrepo], stdout=f.fileno())
- os.lseek(f.fileno(), 0, os.SEEK_SET)
- oldsysrepo.add_susetags(solv.xfopen_fd(None, f.fileno()),
defvendorid, None,
- solv.Repo.REPO_NO_INTERNALIZE |
solv.Repo.SUSETAGS_RECORD_SHARES)
+ oldsysrepo = file_utils.add_susetags(pool, oldrepo)
for arch in self.all_architectures:
for project, repo in self.repos:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20220224.e679863a/pkglistgen/update_repo_handler.py
new/openSUSE-release-tools-20220225.970e958e/pkglistgen/update_repo_handler.py
---
old/openSUSE-release-tools-20220224.e679863a/pkglistgen/update_repo_handler.py
2022-02-24 15:09:15.000000000 +0100
+++
new/openSUSE-release-tools-20220225.970e958e/pkglistgen/update_repo_handler.py
2022-02-25 11:19:10.000000000 +0100
@@ -12,17 +12,14 @@
import shutil
import sys
import tempfile
-
+import requests
+import solv
+import yaml
from lxml import etree as ET
import osc.core
from osclib.cache_manager import CacheManager
-
-import requests
-
-import solv
-
-import yaml
+from pkglistgen import file_utils
from urllib.parse import urljoin, urlparse
@@ -181,27 +178,12 @@
print('-Prv:', file=packages_file)
-def add_susetags(pool, file):
- oldsysrepo = pool.add_repo(file)
- defvendorid = oldsysrepo.meta.lookup_id(solv.SUSETAGS_DEFAULTVENDOR)
- f = tempfile.TemporaryFile()
- if file.endswith('.xz'):
- subprocess.call(['xz', '-cd', file], stdout=f.fileno())
- elif file.endswith('.zst'):
- subprocess.call(['zstd', '-cd', file], stdout=f.fileno())
- else:
- raise Exception("unsupported " + file)
- os.lseek(f.fileno(), 0, os.SEEK_SET)
- oldsysrepo.add_susetags(solv.xfopen_fd(None, f.fileno()), defvendorid,
None,
- solv.Repo.REPO_NO_INTERNALIZE |
solv.Repo.SUSETAGS_RECORD_SHARES)
-
-
def merge_susetags(output, files):
pool = solv.Pool()
pool.setarch()
for file in files:
- add_susetags(pool, file)
+ file_utils.add_susetags(pool, file)
packages = dict()
for s in pool.solvables_iter():
@@ -236,7 +218,7 @@
return False
del opts['refresh']
oldfiles = target_files(package.dir, key)
- newfile = os.path.join(package.dir, f'{fixate}_package')
+ newfile = os.path.join(package.dir, f'{fixate}_packages')
merge_susetags(newfile, oldfiles)
for file in oldfiles:
os.unlink(file)
@@ -320,7 +302,7 @@
if opts.get('refresh', False):
for file in target_files(repo_dir, key):
- add_susetags(pool, file)
+ file_utils.add_susetags(pool, file)
repo1 = pool.add_repo(''.join(random.choice(string.ascii_letters) for
_ in range(5)))
repo1.add_solv(solv_file)
++++++ openSUSE-release-tools.obsinfo ++++++
--- /var/tmp/diff_new_pack.wLmOfE/_old 2022-02-25 21:25:46.927645915 +0100
+++ /var/tmp/diff_new_pack.wLmOfE/_new 2022-02-25 21:25:46.931645915 +0100
@@ -1,5 +1,5 @@
name: openSUSE-release-tools
-version: 20220224.e679863a
-mtime: 1645711755
-commit: e679863a8859b710f28e3d3482258d66db70b9e5
+version: 20220225.970e958e
+mtime: 1645784350
+commit: 970e958ea812ba1901154f24d6a1afabd043a279
