[oe] [meta-python] [PATCH] python3-pykickstart: upgrade 3.20 -> 3.22

Zang Ruochen zangrc.fnst at cn.fujitsu.com
Thu Nov 21 02:14:49 UTC 2019


-Refresh the following patch:
 0003-comment-out-sections-shutdown-and-environment-in-gen.patch

Signed-off-by: Zang Ruochen <zangrc.fnst at cn.fujitsu.com>
---
 ...-out-sections-shutdown-and-environment-in-gen.patch | 10 +++++-----
 ...pykickstart_3.20.bb => python3-pykickstart_3.22.bb} |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename meta-python/recipes-extended/python-pykickstart/{python3-pykickstart_3.20.bb => python3-pykickstart_3.22.bb} (94%)

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 81e351b11..7ab734686 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
  2 files changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/pykickstart/commands/reboot.py b/pykickstart/commands/reboot.py
-index 2c1b1c0..b3ec717 100644
+index 75a6d916..edfe83ff 100644
 --- a/pykickstart/commands/reboot.py
 +++ b/pykickstart/commands/reboot.py
 @@ -43,6 +43,9 @@ class FC3_Reboot(KickstartCommand):
@@ -31,18 +31,18 @@ index 2c1b1c0..b3ec717 100644
          return retval
  
 diff --git a/pykickstart/parser.py b/pykickstart/parser.py
-index e68174d..efd78a6 100644
+index bc59131b..b2d09d45 100644
 --- a/pykickstart/parser.py
 +++ b/pykickstart/parser.py
-@@ -385,7 +385,7 @@ class Packages(KickstartObject):
+@@ -428,7 +428,7 @@ class Packages(KickstartObject):
  
          if not self.default:
              if self.environment:
 -                pkgs += "@^%s\n" % self.environment
 +                pkgs += "#@^%s\n" % self.environment
  
-             grps = self.groupList
-             grps.sort()
+         grps = self.groupList
+         grps.sort()
 -- 
 2.7.4
 
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
similarity index 94%
rename from meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.20.bb
rename to meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.22.bb
index ed10ce958..041abd3e8 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
            file://0003-comment-out-sections-shutdown-and-environment-in-gen.patch \
            file://0004-load.py-retry-to-invoke-request-with-timeout.patch \
            "
-SRCREV = "487edfded19d5969db0673b200ee4272b7dc6697"
+SRCREV = "674c17b1e231f56a0d8a5ced4a204cdbc4c1edf3"
 
 UPSTREAM_CHECK_GITTAGREGEX = "r(?P<pver>\d+(\.\d+)+(-\d+)*)"
 
-- 
2.20.1





More information about the Openembedded-devel mailing list