From e6aeb2e21889d09cb841d20f825ec8a79f5eeb02 Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa13@gmail.com>
Date: Thu, 22 Nov 2018 11:22:18 -0500
Subject: [PATCH] Backport workaround for lack of excludeWeakDeps with EL7
 pykickstart

---
 ...kdeps-for-older-pykickstart-versions.patch | 28 +++++++++++++++++++
 livecd-tools.spec                             |  7 ++++-
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 0001-Fix-excludeWeakdeps-for-older-pykickstart-versions.patch

diff --git a/0001-Fix-excludeWeakdeps-for-older-pykickstart-versions.patch b/0001-Fix-excludeWeakdeps-for-older-pykickstart-versions.patch
new file mode 100644
index 0000000..c21e446
--- /dev/null
+++ b/0001-Fix-excludeWeakdeps-for-older-pykickstart-versions.patch
@@ -0,0 +1,28 @@
+From 4412b55ed2eb6db1180933701b66d7ae4a7fcbd3 Mon Sep 17 00:00:00 2001
+From: Pablo Greco <pablo@fliagreco.com.ar>
+Date: Thu, 22 Nov 2018 16:12:40 +0000
+Subject: [PATCH] Fix excludeWeakdeps for older pykickstart versions
+
+---
+ imgcreate/kickstart.py | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/imgcreate/kickstart.py b/imgcreate/kickstart.py
+index 1b8ac88..aa587b6 100644
+--- a/imgcreate/kickstart.py
++++ b/imgcreate/kickstart.py
+@@ -614,7 +614,10 @@ def exclude_docs(ks):
+     return ks.handler.packages.excludeDocs
+ 
+ def exclude_weakdeps(ks):
+-    return ks.handler.packages.excludeWeakdeps
++    if hasattr(ks.handler.packages, "excludeWeakdeps"):
++        if ks.handler.packages.excludeWeakdeps:
++            return ks.handler.packages.excludeWeakdeps
++    return None
+ 
+ def nocore(ks):
+     return ks.handler.packages.nocore
+-- 
+2.17.2
+
diff --git a/livecd-tools.spec b/livecd-tools.spec
index 214f2d1..ebf29f0 100644
--- a/livecd-tools.spec
+++ b/livecd-tools.spec
@@ -17,7 +17,7 @@
 Summary: Tools for building live CDs
 Name: livecd-tools
 Version: 25.0
-Release: 13%{?dist}
+Release: 14%{?dist}
 Epoch: 1
 License: GPLv2
 Group: System Environment/Base
@@ -33,6 +33,8 @@ Patch2: 0001-DNF-3-workaround-a-bug-with-config-values-that-are-l.patch
 # Work around same issue again, for DNF 3.6 changes:
 # https://github.com/livecd-tools/livecd-tools/pull/108
 Patch3: 0001-Handle-dnf-config-option-showing-as-tuple-not-list-i.patch
+# Workaround lack of excludeWeakDeps with EL7 pykickstart
+Patch4: 0001-Fix-excludeWeakdeps-for-older-pykickstart-versions.patch
 
 %if %{with python2}
 BuildRequires: python2-devel
@@ -224,6 +226,9 @@ rm -rfv %{buildroot}%{_mandir}/man8/livecd-iso-to-*
 %endif
 
 %changelog
+* Thu Nov 22 2018 Neal Gompa <ngompa13@gmail.com> - 1:25.0-14
+- Backport workaround for lack of excludeWeakDeps with EL7 pykickstart
+
 * Thu Nov 15 2018 Neal Gompa <ngompa13@gmail.com> - 1:25.0-13
 - Fix when Python 2 subpackage is obsoleted
 - Fix up EL7 support