|
 |
1a8d67 |
From ad0c452d85b962b1e960fc9deac6338010509192 Mon Sep 17 00:00:00 2001
|
|
|
1a8d67 |
From: Colin Walters <walters@verbum.org>
|
|
|
1a8d67 |
Date: Thu, 17 Apr 2014 17:49:13 -0700
|
|
|
1a8d67 |
Subject: [PATCH 2/2] ostreesetup: Fix noGpg attribute
|
|
|
1a8d67 |
|
|
|
1a8d67 |
Since we're using setToSelf, we need to be consistent with our
|
|
|
1a8d67 |
attribute name.
|
|
|
1a8d67 |
|
|
|
1a8d67 |
Related: rhbz#1113535
|
|
|
1a8d67 |
Port of rpmostreepayload patches from master
|
|
|
1a8d67 |
commit f54112f27a9ce90c7a7adfc595fe9e332f54629a
|
|
|
1a8d67 |
---
|
|
|
1a8d67 |
pykickstart/commands/ostreesetup.py | 4 ++--
|
|
|
1a8d67 |
tests/commands/ostreesetup.py | 2 +-
|
|
|
1a8d67 |
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
1a8d67 |
|
|
|
1a8d67 |
diff --git a/pykickstart/commands/ostreesetup.py b/pykickstart/commands/ostreesetup.py
|
|
|
1a8d67 |
index 269d91f..3b0f335 100644
|
|
|
1a8d67 |
--- a/pykickstart/commands/ostreesetup.py
|
|
|
1a8d67 |
+++ b/pykickstart/commands/ostreesetup.py
|
|
|
1a8d67 |
@@ -33,7 +33,7 @@ class RHEL7_OSTreeSetup(KickstartCommand):
|
|
|
1a8d67 |
self.remote = kwargs.get("remote", self.osname)
|
|
|
1a8d67 |
self.url = kwargs.get('url', None)
|
|
|
1a8d67 |
self.ref = kwargs.get('ref', None)
|
|
|
1a8d67 |
- self.noGpg = kwargs.get('noGpg', False)
|
|
|
1a8d67 |
+ self.nogpg = kwargs.get('nogpg', False)
|
|
|
1a8d67 |
|
|
|
1a8d67 |
def __str__(self):
|
|
|
1a8d67 |
retval = KickstartCommand.__str__(self)
|
|
|
1a8d67 |
@@ -54,7 +54,7 @@ class RHEL7_OSTreeSetup(KickstartCommand):
|
|
|
1a8d67 |
retcmd.append('--url="%s"' % self.url)
|
|
|
1a8d67 |
if self.ref:
|
|
|
1a8d67 |
retcmd.append('--ref="%s"' % self.ref)
|
|
|
1a8d67 |
- if self.noGpg:
|
|
|
1a8d67 |
+ if self.nogpg:
|
|
|
1a8d67 |
retcmd.append('--nogpg')
|
|
|
1a8d67 |
return ' '.join(retcmd)
|
|
|
1a8d67 |
|
|
|
1a8d67 |
diff --git a/tests/commands/ostreesetup.py b/tests/commands/ostreesetup.py
|
|
|
1a8d67 |
index 3c59a5a..ee7be8a 100644
|
|
|
1a8d67 |
--- a/tests/commands/ostreesetup.py
|
|
|
1a8d67 |
+++ b/tests/commands/ostreesetup.py
|
|
|
1a8d67 |
@@ -25,7 +25,7 @@ class RHEL7_TestCase(CommandTest):
|
|
|
1a8d67 |
def runTest(self):
|
|
|
1a8d67 |
# pass
|
|
|
1a8d67 |
self.assert_parse("ostreesetup --osname=fedora-atomic --url=http://example.com/repo --ref=fedora-atomic/sometest/base/core")
|
|
|
1a8d67 |
- cmdstr = "ostreesetup --osname=\"fedora-atomic\" --remote=\"fedora-atomic\" --url=\"http://example.com/repo\" --ref=\"fedora-atomic/sometest/base/core\""
|
|
|
1a8d67 |
+ cmdstr = "ostreesetup --osname=\"fedora-atomic\" --remote=\"fedora-atomic\" --url=\"http://example.com/repo\" --ref=\"fedora-atomic/sometest/base/core\" --nogpg"
|
|
|
1a8d67 |
self.assert_parse(cmdstr, cmdstr + '\n')
|
|
|
1a8d67 |
|
|
|
1a8d67 |
# fail - we have required arguments
|
|
|
1a8d67 |
--
|
|
|
1a8d67 |
1.9.3
|
|
|
1a8d67 |
|