Correct a bug in the patch from -2
This commit is contained in:
parent
3e4ca33b71
commit
9ce2f293e7
@ -1,4 +1,4 @@
|
||||
From a7c1245430597bcfaf595ffce70d16630ef4bfbe Mon Sep 17 00:00:00 2001
|
||||
From 3f4759a58ba87ed434dc0093bda817002ee2400d Mon Sep 17 00:00:00 2001
|
||||
From: Adam Williamson <awilliam@redhat.com>
|
||||
Date: Thu, 30 Aug 2018 11:31:55 -0700
|
||||
Subject: [PATCH] Ditch all use of pyanaconda's simpleconfig
|
||||
@ -99,7 +99,7 @@ index df4444dc..b7a4d1c6 100644
|
||||
dbc.module_platform_id = platform_id
|
||||
|
||||
diff --git a/src/pylorax/sysutils.py b/src/pylorax/sysutils.py
|
||||
index c2f46f1e..1ecbac67 100644
|
||||
index c2f46f1e..9735a7ff 100644
|
||||
--- a/src/pylorax/sysutils.py
|
||||
+++ b/src/pylorax/sysutils.py
|
||||
@@ -30,6 +30,8 @@ import pwd
|
||||
@ -133,7 +133,7 @@ index c2f46f1e..1ecbac67 100644
|
||||
+ """
|
||||
+ with open (filename, 'r') as conffh:
|
||||
+ conftext = "[main]\n" + conffh.read()
|
||||
+ config = ConfigParser()
|
||||
+ config = UnquotingConfigParser()
|
||||
+ config.read_string(conftext)
|
||||
+ return config['main']
|
||||
diff --git a/src/sbin/lorax b/src/sbin/lorax
|
||||
|
@ -4,7 +4,7 @@
|
||||
|
||||
Name: lorax
|
||||
Version: 29.13
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?dist}
|
||||
Summary: Tool for creating the anaconda install images
|
||||
|
||||
Group: Applications/System
|
||||
@ -233,6 +233,9 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin
|
||||
%{_sysconfdir}/bash_completion.d/composer-cli
|
||||
|
||||
%changelog
|
||||
* Thu Aug 30 2018 Adam Williamson <awilliam@redhat.com> - 29.13-3
|
||||
- Correct a bug in the patch from -2
|
||||
|
||||
* Thu Aug 30 2018 Adam Williamson <awilliam@redhat.com> - 29.13-2
|
||||
- Backport upstream PR#451 to avoid undeclared pyanaconda dependency
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user