pykickstart: remove unused patches
This commit is contained in:
parent
6dd74f372c
commit
6d2960e25a
@ -1,45 +0,0 @@
|
|||||||
diff --git a/pykickstart/version.py b/pykickstart/version.py
|
|
||||||
index 379f13f..f107cef 100644
|
|
||||||
--- a/pykickstart/version.py
|
|
||||||
+++ b/pykickstart/version.py
|
|
||||||
@@ -83,8 +83,8 @@ F21 = 19000
|
|
||||||
F22 = 20000
|
|
||||||
F23 = 21000
|
|
||||||
|
|
||||||
-# This always points at the latest version and is the default.
|
|
||||||
-DEVEL = F23
|
|
||||||
+# Point to the proper version of kickstart syntax for this release.
|
|
||||||
+DEVEL = F21
|
|
||||||
|
|
||||||
# A one-to-one mapping from string representations to version numbers.
|
|
||||||
versionMap = {
|
|
||||||
diff --git a/tests/version.py b/tests/version.py
|
|
||||||
index acb79cd..f0b9c29 100644
|
|
||||||
--- a/tests/version.py
|
|
||||||
+++ b/tests/version.py
|
|
||||||
@@ -155,16 +155,6 @@ class StringToVersion_TestCase(CommandTest):
|
|
||||||
class VersionToString_TestCase(CommandTest):
|
|
||||||
def runTest(self):
|
|
||||||
|
|
||||||
- # Make sure DEVEL is the highest version, but RHEL versions aren't
|
|
||||||
- # counted as devel.
|
|
||||||
- highest = 0
|
|
||||||
- for (ver_str,ver_num) in list(versionMap.items()):
|
|
||||||
- if ver_str.startswith("RHEL"):
|
|
||||||
- continue
|
|
||||||
-
|
|
||||||
- highest = max(ver_num, highest)
|
|
||||||
- self.assertEqual(highest, DEVEL)
|
|
||||||
-
|
|
||||||
# FC series
|
|
||||||
self.assertEqual(versionToString(FC3), "FC3")
|
|
||||||
self.assertEqual(versionToString(FC4), "FC4")
|
|
||||||
@@ -191,7 +181,7 @@ class VersionToString_TestCase(CommandTest):
|
|
||||||
self.assertEqual(versionToString(F21, skipDevel=True), "F21")
|
|
||||||
self.assertEqual(versionToString(F22, skipDevel=True), "F22")
|
|
||||||
self.assertEqual(versionToString(F23, skipDevel=True), "F23")
|
|
||||||
- self.assertEqual(versionToString(F23, skipDevel=False), "DEVEL")
|
|
||||||
+ self.assertEqual(versionToString(F21, skipDevel=False), "DEVEL")
|
|
||||||
# RHEL series
|
|
||||||
self.assertEqual(versionToString(RHEL3), "RHEL3")
|
|
||||||
self.assertEqual(versionToString(RHEL4), "RHEL4")
|
|
@ -1,19 +0,0 @@
|
|||||||
diff --git a/tests/parser/packages.py b/tests/parser/packages.py
|
|
||||||
index 9d3b5a2..d842ef7 100644
|
|
||||||
--- a/tests/parser/packages.py
|
|
||||||
+++ b/tests/parser/packages.py
|
|
||||||
@@ -86,9 +86,11 @@ bash
|
|
||||||
"""
|
|
||||||
|
|
||||||
def runTest(self):
|
|
||||||
- with warnings.catch_warnings(record=True):
|
|
||||||
- warnings.simplefilter("always")
|
|
||||||
- self.assertRaises(KickstartParseError, self.parser.readKickstartFromString, self.ks)
|
|
||||||
+ pass
|
|
||||||
+# FIXME: Is this important?
|
|
||||||
+# with warnings.catch_warnings(record=True):
|
|
||||||
+# warnings.simplefilter("always")
|
|
||||||
+# self.assertRaises(KickstartParseError, self.parser.readKickstartFromString, self.ks)
|
|
||||||
|
|
||||||
class Packages_Contains_Nobase_Default_TestCase(ParserTest):
|
|
||||||
version = F21
|
|
@ -23,8 +23,6 @@ Url: http://fedoraproject.org/wiki/pykickstart
|
|||||||
# make po-pull && make archive
|
# make po-pull && make archive
|
||||||
# The tarball will be in the current directory.
|
# The tarball will be in the current directory.
|
||||||
Source0: %{name}-%{version}.tar.gz
|
Source0: %{name}-%{version}.tar.gz
|
||||||
#Patch0: 0001-Default-to-the-F21-version-of-kickstart-syntax.patch
|
|
||||||
#Patch1: 0002-disable-test.patch
|
|
||||||
Patch2: repo-gpgkey-option.patch
|
Patch2: repo-gpgkey-option.patch
|
||||||
Patch3: standard-xgettext.patch
|
Patch3: standard-xgettext.patch
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
Loading…
Reference in New Issue
Block a user