diff options
| author | Hongxu Jia <hongxu.jia@windriver.com> | 2018-08-01 15:21:39 +0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2018-08-02 11:23:03 -0700 |
| commit | 4c61e30cfb965d260fc0cd5339a3a7c8e781eac2 (patch) | |
| tree | 0a6376d8b95c362088544d1b0aaf73ffd7bc0e22 /meta-python/recipes-extended/python-pykickstart/files/0003-comment-out-sections-shutdown-and-environment-in-gen.patch | |
| parent | f38ff38f48468a4505ed6396e832d2574d7914d7 (diff) | |
| download | meta-openembedded-4c61e30cfb965d260fc0cd5339a3a7c8e781eac2.tar.gz | |
python3-pykickstart: 2.35 -> 3.15
- Rebase 0001 ~ 0004
- Drop 0005-tweak-shebang-to-python3.patch
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-python/recipes-extended/python-pykickstart/files/0003-comment-out-sections-shutdown-and-environment-in-gen.patch')
| -rw-r--r-- | meta-python/recipes-extended/python-pykickstart/files/0003-comment-out-sections-shutdown-and-environment-in-gen.patch | 10 |
1 files changed, 5 insertions, 5 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 9fb25fb18f..81e351b11f 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 | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From be6012a5dd49ae5e8ac035654ab1c6f37f0dc8f4 Mon Sep 17 00:00:00 2001 | 1 | From 44226393812399c61de9ca9281efa002ad4f4c01 Mon Sep 17 00:00:00 2001 |
| 2 | From: Hongxu Jia <hongxu.jia@windriver.com> | 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
| 3 | Date: Thu, 1 Jun 2017 15:15:15 +0800 | 3 | Date: Thu, 1 Jun 2017 15:15:15 +0800 |
| 4 | Subject: [PATCH 3/4] comment out sections shutdown and environment in | 4 | Subject: [PATCH 3/4] comment out sections shutdown and environment in |
| @@ -17,10 +17,10 @@ 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 88799ba..2d0cea9 100644 | 20 | index 2c1b1c0..b3ec717 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 | @@ -41,6 +41,9 @@ class FC3_Reboot(KickstartCommand): | 23 | @@ -43,6 +43,9 @@ class FC3_Reboot(KickstartCommand): |
| 24 | elif self.action == KS_SHUTDOWN: | 24 | elif self.action == KS_SHUTDOWN: |
| 25 | retval += "# Shutdown after installation\nshutdown" | 25 | retval += "# Shutdown after installation\nshutdown" |
| 26 | retval += self._getArgsAsStr() + "\n" | 26 | retval += self._getArgsAsStr() + "\n" |
| @@ -31,10 +31,10 @@ index 88799ba..2d0cea9 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 264ba05..b3f33d7 100644 | 34 | index e68174d..efd78a6 100644 |
| 35 | --- a/pykickstart/parser.py | 35 | --- a/pykickstart/parser.py |
| 36 | +++ b/pykickstart/parser.py | 36 | +++ b/pykickstart/parser.py |
| 37 | @@ -383,7 +383,7 @@ class Packages(KickstartObject): | 37 | @@ -385,7 +385,7 @@ class Packages(KickstartObject): |
| 38 | 38 | ||
| 39 | if not self.default: | 39 | if not self.default: |
| 40 | if self.environment: | 40 | if self.environment: |
