diff options
| -rw-r--r-- | meta-python/recipes-extended/python-pykickstart/files/0003-comment-out-sections-shutdown-and-environment-in-gen.patch | 10 | ||||
| -rw-r--r-- | meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.22.bb (renamed from meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.20.bb) | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/meta-python/recipes-extended/python-pykickstart/files/0003-comment-out-sections-shutdown-and-environment-in-gen.patch b/meta-python/recipes-extended/python-pykickstart/files/0003-comment-out-sections-shutdown-and-environment-in-gen.patch index 81e351b11f..7ab7346860 100644 --- a/meta-python/recipes-extended/python-pykickstart/files/0003-comment-out-sections-shutdown-and-environment-in-gen.patch +++ b/meta-python/recipes-extended/python-pykickstart/files/0003-comment-out-sections-shutdown-and-environment-in-gen.patch | |||
| @@ -17,7 +17,7 @@ fixup! add comments of shutdown for user | |||
| 17 | 2 files changed, 4 insertions(+), 1 deletion(-) | 17 | 2 files changed, 4 insertions(+), 1 deletion(-) |
| 18 | 18 | ||
| 19 | diff --git a/pykickstart/commands/reboot.py b/pykickstart/commands/reboot.py | 19 | diff --git a/pykickstart/commands/reboot.py b/pykickstart/commands/reboot.py |
| 20 | index 2c1b1c0..b3ec717 100644 | 20 | index 75a6d916..edfe83ff 100644 |
| 21 | --- a/pykickstart/commands/reboot.py | 21 | --- a/pykickstart/commands/reboot.py |
| 22 | +++ b/pykickstart/commands/reboot.py | 22 | +++ b/pykickstart/commands/reboot.py |
| 23 | @@ -43,6 +43,9 @@ class FC3_Reboot(KickstartCommand): | 23 | @@ -43,6 +43,9 @@ class FC3_Reboot(KickstartCommand): |
| @@ -31,18 +31,18 @@ index 2c1b1c0..b3ec717 100644 | |||
| 31 | return retval | 31 | return retval |
| 32 | 32 | ||
| 33 | diff --git a/pykickstart/parser.py b/pykickstart/parser.py | 33 | diff --git a/pykickstart/parser.py b/pykickstart/parser.py |
| 34 | index e68174d..efd78a6 100644 | 34 | index bc59131b..b2d09d45 100644 |
| 35 | --- a/pykickstart/parser.py | 35 | --- a/pykickstart/parser.py |
| 36 | +++ b/pykickstart/parser.py | 36 | +++ b/pykickstart/parser.py |
| 37 | @@ -385,7 +385,7 @@ class Packages(KickstartObject): | 37 | @@ -428,7 +428,7 @@ class Packages(KickstartObject): |
| 38 | 38 | ||
| 39 | if not self.default: | 39 | if not self.default: |
| 40 | if self.environment: | 40 | if self.environment: |
| 41 | - pkgs += "@^%s\n" % self.environment | 41 | - pkgs += "@^%s\n" % self.environment |
| 42 | + pkgs += "#@^%s\n" % self.environment | 42 | + pkgs += "#@^%s\n" % self.environment |
| 43 | 43 | ||
| 44 | grps = self.groupList | 44 | grps = self.groupList |
| 45 | grps.sort() | 45 | grps.sort() |
| 46 | -- | 46 | -- |
| 47 | 2.7.4 | 47 | 2.7.4 |
| 48 | 48 | ||
diff --git a/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.20.bb b/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.22.bb index ed10ce958c..041abd3e8d 100644 --- a/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.20.bb +++ b/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.22.bb | |||
| @@ -18,7 +18,7 @@ SRC_URI = "git://github.com/rhinstaller/pykickstart.git;protocol=https;branch=ma | |||
| 18 | file://0003-comment-out-sections-shutdown-and-environment-in-gen.patch \ | 18 | file://0003-comment-out-sections-shutdown-and-environment-in-gen.patch \ |
| 19 | file://0004-load.py-retry-to-invoke-request-with-timeout.patch \ | 19 | file://0004-load.py-retry-to-invoke-request-with-timeout.patch \ |
| 20 | " | 20 | " |
| 21 | SRCREV = "487edfded19d5969db0673b200ee4272b7dc6697" | 21 | SRCREV = "674c17b1e231f56a0d8a5ced4a204cdbc4c1edf3" |
| 22 | 22 | ||
| 23 | UPSTREAM_CHECK_GITTAGREGEX = "r(?P<pver>\d+(\.\d+)+(-\d+)*)" | 23 | UPSTREAM_CHECK_GITTAGREGEX = "r(?P<pver>\d+(\.\d+)+(-\d+)*)" |
| 24 | 24 | ||
