From: Karel Valek <kvalek(a)redhat.com>
Signed-off-by: Karel Valek <kvalek(a)redhat.com>
---
pyanaconda/packaging/yumpayload.py | 1 +
scripts/anaconda-yum | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/pyanaconda/packaging/yumpayload.py b/pyanaconda/packaging/yumpayload.py
index 8474992..6586f8b 100644
--- a/pyanaconda/packaging/yumpayload.py
+++ b/pyanaconda/packaging/yumpayload.py
@@ -1441,6 +1441,7 @@ def install(self):
progress_map = {
"PROGRESS_PREP" : _("Preparing transaction from
installation source"),
"PROGRESS_INSTALL" : _("Installing"),
+ "PROGRESS_RETRY" : _(""),
"PROGRESS_POST" : _("Performing post-installation setup
tasks")
}
diff --git a/scripts/anaconda-yum b/scripts/anaconda-yum
index 78b05ca..7caad09 100755
--- a/scripts/anaconda-yum
+++ b/scripts/anaconda-yum
@@ -134,7 +134,7 @@ def run_yum_transaction(release, arch, yum_conf, install_root,
ts_file, script_l
if retry_count:
# retry after waiting a bit
time.sleep(next(xdelay))
- print("ERROR: error populating transaction, retrying (%d/%d)"
+ print("PROGRESS_RETRY: Error populating transaction, retrying
(%d/%d)"
% (retry_count, MAX_DOWNLOAD_RETRIES))
try:
# uses dsCallback.transactionPopulation
@@ -144,7 +144,7 @@ def run_yum_transaction(release, arch, yum_conf, install_root,
ts_file, script_l
continue
else:
# else = no break called = no successful attempt
- print("ERROR: error populating transaction after %d retries: %s"
+ print("PROGRESS_RETRY: Error populating transaction after %d retries:
%s"
% (retry_count, e))
# we don't need to print "QUIT:" there, the finally clause
# of the toplevel try-block will do that for us
--
To view this commit on github, visit
https://github.com/rhinstaller/anaconda/commit/5768fc46c10c6fc16aef6ee732...