... | ... |
@@ -91,20 +91,20 @@ class IsoInstaller(object): |
91 | 91 |
def validate_ostree_url_input(self, text): |
92 | 92 |
status = 0 |
93 | 93 |
if not text: |
94 |
- return False, "Error: Invalid input " |
|
94 |
+ return False, "Error: Invalid input" |
|
95 | 95 |
|
96 | 96 |
try: |
97 | 97 |
status = urllib.urlopen(text).getcode() |
98 | 98 |
except: |
99 |
- return False , "Error: Invalid Url " |
|
99 |
+ return False , "Error: Invalid or unreachable Url" |
|
100 | 100 |
else: |
101 | 101 |
if status != 200: |
102 |
- return False , "Error: URL not accessible " |
|
102 |
+ return False , "Error: URL not accessible" |
|
103 | 103 |
|
104 | 104 |
return True, None |
105 | 105 |
|
106 | 106 |
def validate_ostree_refs_input(self, text): |
107 |
- return not (not text), "Error: Invalid input " |
|
107 |
+ return not (not text), "Error: Invalid input" |
|
108 | 108 |
|
109 | 109 |
def validate_password(self, text): |
110 | 110 |
try: |
... | ... |
@@ -208,7 +208,7 @@ class IsoInstaller(object): |
208 | 208 |
self.validate_ostree_url_input, # validation function of the input |
209 | 209 |
None, # post processing of the input field |
210 | 210 |
'Please provide the URL of OSTree repo', 'OSTree Repo URL:', 2, install_config, |
211 |
- "") |
|
211 |
+ "http://") |
|
212 | 212 |
ostree_ref_reader = OSTreeWindowStringReader( |
213 | 213 |
self.maxy, self.maxx, 10, 70, |
214 | 214 |
'ostree_repo_ref', |
... | ... |
@@ -218,7 +218,7 @@ class IsoInstaller(object): |
218 | 218 |
self.validate_ostree_refs_input, # validation function of the input |
219 | 219 |
None, # post processing of the input field |
220 | 220 |
'Please provide the Ref in OSTree repo', 'OSTree Repo Ref:', 2, install_config, |
221 |
- "") |
|
221 |
+ "tp2/x86_64/minimal") |
|
222 | 222 |
|
223 | 223 |
items = items + [ |
224 | 224 |
(license_agreement.display, False), |
... | ... |
@@ -117,6 +117,8 @@ class ReadText(Action): |
117 | 117 |
if self.validation_fn: |
118 | 118 |
success, err = self.validation_fn(self.str) |
119 | 119 |
if not success: |
120 |
+ spaces = ' ' * self.textwin_width |
|
121 |
+ self.textwin.addstr(self.y + 2, 0, spaces) |
|
120 | 122 |
self.textwin.addstr(self.y + 2, 0, err, curses.color_pair(4)) |
121 | 123 |
return success |
122 | 124 |
else: |