define dist as %{nil} instead of undefining it

Workaround for https://bugzilla.redhat.com/show_bug.cgi?id=2331650
theforeman · Dec 11, 2024 · 481dec8 · 481dec8
1 parent 7a10a68
commit 481dec8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/obal/data/module_utils/obal.py b/obal/data/module_utils/obal.py
@@ -15,7 +15,7 @@ def macro_lookup(command, scl=None, dist=None, macros=None):
     if dist:
         command += ['--define', 'dist %s' % dist]
     else:
-        command += ['--undefine', 'dist']
+        command += ['--define', 'dist %{nil}']
 
     if scl:
         command += ['--define', 'scl %s' % scl]

diff --git a/obal/data/modules/srpm.py b/obal/data/modules/srpm.py
@@ -96,7 +96,7 @@ def build_srpm(module, package, base_dir, sources_dir, scl=None, macros=None):
     command += ['--define', '_builddir %s' % build_dir]
     command += ['--define', '_srcrpmdir %s' % base_dir]
     command += ['--define', '_rpmdir %s' % base_dir]
-    command += ['--undefine', 'dist']
+    command += ['--define', 'dist %{nil}']
 
     if scl:
         command += ['--define', 'scl %s' %  scl]