aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2019-06-29 04:00:45 -0400
committerHongxu Jia <hongxu.jia@windriver.com>2019-07-06 11:29:48 +0800
commit7541fc54904bf8a8121ff8fea07a30c972191d56 (patch)
tree5a995b1c288c4a66fe2efb3ff4466feff809fc1f
parent7f2ab9190a45d52f31c9230d48b235b758701e41 (diff)
downloadmeta-anaconda-7541fc54904bf8a8121ff8fea07a30c972191d56.tar.gz
meta-anaconda-7541fc54904bf8a8121ff8fea07a30c972191d56.tar.bz2
meta-anaconda-7541fc54904bf8a8121ff8fea07a30c972191d56.zip
python3-anaconda re-organize local patch: rebase 0047-remove-incorrect-prefix-of-addon-repo-url.patch
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
-rw-r--r--recipes-installer/anaconda/files/0047-remove-incorrect-prefix-of-addon-repo-url.patch23
1 files changed, 11 insertions, 12 deletions
diff --git a/recipes-installer/anaconda/files/0047-remove-incorrect-prefix-of-addon-repo-url.patch b/recipes-installer/anaconda/files/0047-remove-incorrect-prefix-of-addon-repo-url.patch
index 4a82404..f36e0c7 100644
--- a/recipes-installer/anaconda/files/0047-remove-incorrect-prefix-of-addon-repo-url.patch
+++ b/recipes-installer/anaconda/files/0047-remove-incorrect-prefix-of-addon-repo-url.patch
@@ -1,7 +1,7 @@
-From bf3c8c08ecfc4e60501b07686aa22b0de7e135f2 Mon Sep 17 00:00:00 2001
+From 42dcc8683f600d3902fdcb841922bd14bff7e160 Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com>
-Date: Wed, 25 Jul 2018 10:47:12 +0800
-Subject: [PATCH 47/65] remove incorrect prefix of addon repo url
+Date: Sat, 29 Jun 2019 16:00:30 +0800
+Subject: [PATCH] remove incorrect prefix of addon repo url
While user set addon repo url with "http://128.224.162.227/intel_x86_64/",
it has incorrect prefix "http://http://128.224.162.227/intel_x86_64/".
@@ -12,23 +12,22 @@ Upstream-Status: Pending
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
- pyanaconda/ui/gui/spokes/installation_source.py | 3 +++
- 1 file changed, 3 insertions(+)
+ pyanaconda/ui/gui/spokes/installation_source.py | 2 ++
+ 1 file changed, 2 insertions(+)
diff --git a/pyanaconda/ui/gui/spokes/installation_source.py b/pyanaconda/ui/gui/spokes/installation_source.py
-index 89e51b5..9144785 100644
+index 6fddfd7..6f725a4 100644
--- a/pyanaconda/ui/gui/spokes/installation_source.py
+++ b/pyanaconda/ui/gui/spokes/installation_source.py
-@@ -1587,6 +1587,9 @@ class SourceSpoke(NormalSpoke, GUISpokeInputCheckHandler):
- url_prefix = REPO_PROTO[combo_protocol]
+@@ -1713,6 +1713,8 @@ class SourceSpoke(NormalSpoke, GUISpokeInputCheckHandler):
- url = self._repoUrlEntry.get_text().strip()
+ url_prefix = REPO_PROTO[combo_protocol]
+ url = self._repo_url_entry.get_text().strip()
+ if url.startswith(url_prefix):
+ url = url[len(url_prefix):]
-+
+
if combo_protocol in (PROTOCOL_HTTP, PROTOCOL_HTTPS):
- url_type = self._repoUrlTypeComboBox.get_active_id()
- repo.baseurl = repo.mirrorlist = repo.metalink = ""
+ url_type = self._repo_url_type_combo_box.get_active_id()
--
2.7.4