1 files changed, 22 insertions, 31 deletions
diff --git a/recipes-installer/anaconda/files/0054-tweak-MAX_TREEINFO_DOWNLOAD_RETRIES.patch b/recipes-installer/anaconda/files/0054-tweak-MAX_TREEINFO_DOWNLOAD_RETRIES.patch
index a6e0d42..2486a45 100644
--- a/recipes-installer/anaconda/files/0054-tweak-MAX_TREEINFO_DOWNLOAD_RETRIES.patch
+++ b/recipes-installer/anaconda/files/0054-tweak-MAX_TREEINFO_DOWNLOAD_RETRIES.patch
@@ -10,40 +10,31 @@ Tweak log debug to log info.
 Upstream-Status: Inappropriate [oe specific]
 
 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+
+Rebase for anaconda 34.
+
+Signed-off-by: Kai Kang <kai.kang@windriver.com>
+
+Rebase for anaconda 37.
+
+Signed-off-by: Kai Kang <kai.kang@windriver.com>
 ---
- pyanaconda/payload/__init__.py              | 4 ++--
- pyanaconda/payload/install_tree_metadata.py | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/pyanaconda/payload/__init__.py b/pyanaconda/payload/__init__.py
-index 8b48625..cbe2154 100644
---- a/pyanaconda/payload/__init__.py
-+++ b/pyanaconda/payload/__init__.py
-@@ -428,9 +428,9 @@ class Payload(metaclass=ABCMeta):
- 
-         if self._install_tree_metadata:
-             version = self._install_tree_metadata.get_release_version()
--            log.debug("using treeinfo release version of %s", version)
-+            log.info("using treeinfo release version of %s", version)
-         else:
--            log.debug("using default release version of %s", version)
-+            log.info("using default release version of %s", version)
- 
-         return version
- 
-diff --git a/pyanaconda/payload/install_tree_metadata.py b/pyanaconda/payload/install_tree_metadata.py
-index 30abfd6..04799ce 100644
---- a/pyanaconda/payload/install_tree_metadata.py
-+++ b/pyanaconda/payload/install_tree_metadata.py
-@@ -27,7 +27,7 @@ from pyanaconda.core import util, constants
- from pyanaconda.anaconda_loggers import get_packaging_logger
- log = get_packaging_logger()
- 
--MAX_TREEINFO_DOWNLOAD_RETRIES = 6
-+MAX_TREEINFO_DOWNLOAD_RETRIES = 1
+ pyanaconda/modules/payloads/payload/dnf/tree_info.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pyanaconda/modules/payloads/payload/dnf/tree_info.py b/pyanaconda/modules/payloads/payload/dnf/tree_info.py
+index b0aa5f1d28..265419a6f9 100644
+--- a/pyanaconda/modules/payloads/payload/dnf/tree_info.py
++++ b/pyanaconda/modules/payloads/payload/dnf/tree_info.py
+@@ -89,7 +89,7 @@ class TreeInfoMetadata(object):
+     TREE_INFO_NAMES = [".treeinfo", "treeinfo"]
  
+     # The number of download retries.
+-    MAX_TREEINFO_DOWNLOAD_RETRIES = 6
++    MAX_TREEINFO_DOWNLOAD_RETRIES = 1
  
- class InstallTreeMetadata(object):
+     def __init__(self):
+         """Create a new instance."""
 -- 
 2.7.4