From 1e77448b3a6bd9f935c76da09a8d010cfb201457 Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Tue, 12 Apr 2022 09:57:06 -0400
Subject: [PATCH] Fix comment support in pkglist for imgutil

---
 imgutil/imgutil | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/imgutil/imgutil b/imgutil/imgutil
index 4e130b56..f097d6c3 100644
--- a/imgutil/imgutil
+++ b/imgutil/imgutil
@@ -425,11 +425,13 @@ class OsHandler(object):
         if pkglistfile[-1] == '>':
             pkglistfile = pkglistfile[:-1]
         with open(pkglistfile, 'r') as pkglist:
-            pkgs = pkglist.read()
+            pkgs = ''
+            for line in pkglist.readlines():
+                line = line.split('#', 1)[0].strip()
+                pkgs += line + ' '
             pkgs = pkgs.split()
         retpkgs = []
         for pkg in pkgs:
-            pkg = pkg.split('#', 1)[0].strip()
             if not pkg:
                 continue
             if pkg[0] == '<':  # Include from specified file
@@ -707,7 +709,7 @@ def main():
     sps = parser.add_subparsers(dest='subcommand')
     buildp = sps.add_parser('build', help='Build a new diskless image from scratch')
     buildp.add_argument('-r', '--addrepos', help='Repositories to add in addition to the main source', default=[], action='append')
-    buildp.add_argument('-p', '--packagelist', help='Filename of package list', default='')
+    buildp.add_argument('-p', '--packagelist', help='Filename of package list to replace default pkglist', default='')
     buildp.add_argument('-s', '--source', help='Directory to pull installation from, typically a subdirectory of /var/lib/confluent/distributions. By default, the repositories for the build system are used.')
     buildp.add_argument('-v', '--volume',
         help='Directory to make available in the build environment.  -v / will '