From 8c091e3f6b2d31dfad22e2ff43ff1469ca6bab7b Mon Sep 17 00:00:00 2001 From: Karanbir Singh Date: Dec 08 2015 15:06:24 +0000 Subject: dont retry repomd more than 2 times if we are not online --- diff --git a/SOURCES/anaconda-centos-skip-retry-if-not-connected.patch b/SOURCES/anaconda-centos-skip-retry-if-not-connected.patch new file mode 100644 index 0000000..2e51bc2 --- /dev/null +++ b/SOURCES/anaconda-centos-skip-retry-if-not-connected.patch @@ -0,0 +1,14 @@ +diff -uNr anaconda-21.48.22.56__orig/pyanaconda/packaging/yumpayload.py anaconda-21.48.22.56/pyanaconda/packaging/yumpayload.py +--- anaconda-21.48.22.56__orig/pyanaconda/packaging/yumpayload.py 2015-12-08 14:36:52.533000000 +0000 ++++ anaconda-21.48.22.56/pyanaconda/packaging/yumpayload.py 2015-12-08 14:38:51.464000000 +0000 +@@ -648,6 +648,10 @@ + # so that unattended installations on unreliable networks have + # a higher chance of finishing successfully + xdelay = xprogressive_delay() ++ if not nm_is_connected(): ++ MAX_METADATA_DOWNLOAD_RETRIES = 1 ++ else: ++ MAX_METADATA_DOWNLOAD_RETRIES = 10 + for retry_count in xrange(0, MAX_METADATA_DOWNLOAD_RETRIES + 1): + if retry_count > 0: + # introduce a retry delay diff --git a/SPECS/anaconda.spec b/SPECS/anaconda.spec index db4f5c6..3536ea8 100644 --- a/SPECS/anaconda.spec +++ b/SPECS/anaconda.spec @@ -3,7 +3,7 @@ Summary: Graphical system installer Name: anaconda Version: 21.48.22.56 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ and MIT Group: Applications/System URL: http://fedoraproject.org/wiki/Anaconda @@ -19,6 +19,7 @@ Patch2: anaconda-centos-set-right-eula-location.patch Patch4: anaconda-centos-disable-mirrors.patch Patch5: anaconda-centos-bootfs-default-to-xfs.patch Patch6: anaconda-centos-help-text.patch +Patch7: anaconda-centos-skip-retry-if-not-connected.patch # Versions of required components (done so we make sure the buildrequires # match the requires versions of things). @@ -233,6 +234,7 @@ runtime on NFS/HTTP/FTP servers or local disks. %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 %build %configure --disable-static \ @@ -324,7 +326,7 @@ update-desktop-database &> /dev/null || : %{_prefix}/libexec/anaconda/dd_* %changelog -* Mon Dec 7 2015 Karanbir Singh - 21.48.22.56-2.el7.centos +* Mon Dec 7 2015 Karanbir Singh - 21.48.22.56-5.el7.centos - Forward port existing patch - discard efivar patch, rolled into install class - setup new help text @@ -332,6 +334,7 @@ update-desktop-database &> /dev/null || : - ensure productName is available in the yumpayload - use our own stubs for help - remove the hard dep for anaconda-user-help ( since its far too upstream specific ) +- Skip repo md retry if we are not online ( try at most 2 times ( * Thu Nov 19 2015 CentOS Sources - 21.48.22.56-1.el7.centos - Add CentOS install class as default