resolve #19

Resolves PR #19 and makes both iso and live classes consistent.

Signed-off-by: Sergei Shtepa <sshtepa@noreply@resf.org>
Signed-off-by: Louis Abel <label@rockylinux.org>

iso/empanadas/empanadas/util/iso_utils.py

@@ -81,12 +81,11 @@ class IsoBuild:
         self.compose_root = config['compose_root']
         self.compose_base = config['compose_root'] + "/" + major
         self.current_arch = config['arch']
-        self.required_pkgs = rlvars['iso_map']['lorax']['required_pkgs']
+        #self.required_pkgs = rlvars['iso_map']['lorax']['required_pkgs']
         self.mock_work_root = config['mock_work_root']
         self.lorax_result_root = config['mock_work_root'] + "/" + "lorax"
         self.mock_isolation = isolation
         self.iso_map = rlvars['iso_map']
-        #self.livemap = rlvars['livemap']
         self.cloudimages = rlvars['cloudimages']
         self.release_candidate = rc
         self.s3 = s3
@@ -253,6 +252,7 @@ class IsoBuild:
         mock_iso_path = '/var/tmp/lorax-' + self.release + '.cfg'
         mock_sh_path = '/var/tmp/isobuild.sh'
         iso_template_path = '/var/tmp/buildImage.sh'
+        required_pkgs = self.iso_map['lorax']['required_pkgs']
 
         rclevel = ''
         if self.release_candidate:
@@ -829,6 +829,7 @@ class IsoBuild:
         isoname = f'{self.shortname}-{self.release}{rclevel}{datestamp}-{arch}-{image}.iso'
         generic_isoname = f'{self.shortname}-{arch}-{image}.iso'
         latest_isoname = f'{self.shortname}-{self.major_version}-latest-{arch}-{image}.iso'
+        required_pkgs = self.iso_map['lorax']['required_pkgs']
 
         lorax_pkg_cmd = '/usr/bin/dnf install {} -y {}'.format(
                 ' '.join(required_pkgs),
@@ -1518,7 +1519,7 @@ class LiveBuild:
         self.compose_base = config['compose_root'] + "/" + major
         self.current_arch = config['arch']
         self.livemap = rlvars['livemap']
-        self.required_pkgs = rlvars['livemap']['required_pkgs']
+        #self.required_pkgs = rlvars['livemap']['required_pkgs']
         self.mock_work_root = config['mock_work_root']
         self.live_result_root = config['mock_work_root'] + "/lmc"
         self.mock_isolation = isolation

mangle/generators/rss.py

@@ -4,6 +4,22 @@
 # modified version of repo-rss from yum utils
 # changelog
 #  -> 20230912: do not xmlescape entire description variable
+#  -> 20240819: remove commented commands and imports
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# seth vidal 2005 (c) etc etc
 
 import sys
 import os
@@ -19,8 +35,6 @@ from xml.etree.ElementTree import ElementTree, TreeBuilder, tostring
 from xml.dom import minidom
 import dnf
 import dnf.exceptions
-#from dnf.comps import Comps
-#import libxml2
 
 def to_unicode(string: str) -> str:
     """
@@ -277,9 +291,7 @@ def main(options):
         modobj.disable(['*'])
 
     sack_query = dnfobj.sack.query().available()
-    #recent = sack_query.filter(latest_per_arch=1)
     recent = dnfobj.get_recent(days=days)
-    #sorted_recents = sorted(set(recent.run()), key=lambda pkg: pkg.buildtime)
     sorted_recents = sorted(set(recent), key=lambda pkg: pkg.buildtime)
     sorted_recents.reverse()
     make_rss_feed(options.filename, options.title, options.link,