mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-09-07 21:58:41 +02:00
Code Activity

Revert "Run decode_it also in the other case"

Browse Source 
MLS wants this to be done in the caller not in the callee.

This reverts commit 709e0d87ac.
This commit is contained in:
Dirk Mueller
2025-04-04 10:44:36 +02:00
parent b2cf75c7d1
commit 1549f53258
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
osc/fetch.py
View File

@@ -78,7 +78,7 @@ class Fetcher:
if n.startswith(b'container:'):
n = re.sub(br'\.tar\.(zst|.z)$', b'.tar', hdr.filename)
pac = pkgs[decode_it(n.rsplit(b'.', 1)[0])]
pac.canonname = hdr.filename
pac.canonname = decode_it(hdr.filename)
else:
pac = pkgs[decode_it(n.rsplit(b'.', 1)[0])]
else:
@@ -163,7 +163,7 @@ class Fetcher:
def move_package(self, tmpfile, destdir, pac_obj=None):
canonname = None
if pac_obj and (pac_obj.name.startswith('container:') or pac_obj.binary in ('updateinfo.xml', '_modulemd.yaml')):
canonname = decode_it(pac_obj.canonname)
canonname = pac_obj.canonname
if canonname is None:
pkgq = packagequery.PackageQuery.query(tmpfile, extra_rpmtags=(1044, 1051, 1052))
if pkgq: