almalinux/pungi
14
1
Fork 0
Code Issues Pull Requests Releases Activity

ALBS-226: Patch pungi/lorax for building AL9 #3

Merged
soksanichenko merged 3 commits from ALBS-226 into aln9 2022-03-21 15:52:51 +00:00
Conversation 0 Commits 3 Files Changed 2 +6 -3
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit acfdfcef15 - Show all commits

5
pungi/scripts/gather_modules.py
View File

@ -12,6 +12,9 @@ import createrepo_c as cr
from typing.io import BinaryIO
EMPTY_FILE = '.empty'
def _is_compressed_file(first_two_bytes: bytes, initial_bytes: bytes):
return binascii.hexlify(first_two_bytes) == initial_bytes
@ -67,7 +70,7 @@ def collect_modules(modules_paths: List[BinaryIO], target_dir: str):
os.makedirs(module_defaults_path, exist_ok=True)
# Defaults modules can be empty, but pungi detects
# empty folder while copying and raises the exception in this case
Path(os.path.join(module_defaults_path, '.empty')).touch()
Path(os.path.join(module_defaults_path, EMPTY_FILE)).touch()
monkrobot commented 2022-03-21 09:21:36 +00:00
Review
Copy Link

Why do you use here pathlib Path and os.path together? Maybe it's better to use just pathlib?

Why do you use here pathlib Path and os.path together? Maybe it's better to use just pathlib?
for module_file in modules_paths:
data = module_file.read()

4
tests/test_gather_modules.py
View File

@ -3,7 +3,7 @@ import gzip
import os
from io import StringIO
import yaml
from pungi.scripts.gather_modules import collect_modules
from pungi.scripts.gather_modules import collect_modules, EMPTY_FILE
import unittest
from pyfakefs.fake_filesystem_unittest import TestCase
@ -106,7 +106,7 @@ class TestModulesYamlParser(TestCase):
self.assertEqual(['mariadb-devel-10.3_1-8010020200108182321.cdc1202b',
'javapackages-tools-201801-8000020190628172923.b07bea58'],
os.listdir(os.path.join(PATH_TO_KOJI, 'modules/x86_64')))
self.assertEqual(['ant.yaml'],
self.assertEqual(['ant.yaml', EMPTY_FILE],
os.listdir(os.path.join(PATH_TO_KOJI, 'module_defaults')))
# check that modules were exported