Skip to content
This repository has been archived by the owner on May 22, 2019. It is now read-only.

Commit

Permalink
Add check for install blocking packaging issues so we can prevent use…
Browse files Browse the repository at this point in the history
…rs from ending up with non-bootable systems due to temporary packaging issues
  • Loading branch information
lots0logs committed Jul 5, 2017
1 parent 8b28a1e commit 73626bb
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 3 deletions.
10 changes: 9 additions & 1 deletion cnchi/check.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ def __init__(self, params, prev_page="language", next_page="location"):
self.timeout_id = None
self.prepare_best_results = None
self.updated = None
self.packaging_issues = None

self.label_space = self.ui.get_object("label_space")

Expand Down Expand Up @@ -108,6 +109,10 @@ def translate_ui(self):
txt = _("is connected to the Internet")
self.prepare_network_connection.set_property("label", txt)

self.packaging_issues = self.ui.get_object("packaging_issues")
txt = _("There are no temporary packaging issues that would interfere with installation.")
self.prepare_network_connection.set_property("label", txt)

self.prepare_best_results = self.ui.get_object("prepare_best_results")
txt = _("For best results, please ensure that this computer:")
txt = '<span weight="bold" size="large">{0}</span>'.format(txt)
Expand All @@ -134,6 +139,9 @@ def check_all(self):
space = self.has_enough_space()
self.prepare_enough_space.set_state(space)

packaging_issues = os.path.exists('/tmp/.packaging_issue')
self.packaging_issues.set_state(not packaging_issues)

if has_internet:
updated = self.is_updated()
else:
Expand All @@ -144,7 +152,7 @@ def check_all(self):
if self.checks_are_optional:
return True

if has_internet and space:
if has_internet and space and not packaging_issues:
return True

return False
Expand Down
2 changes: 1 addition & 1 deletion cnchi/info.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

""" Set some Cnchi global constants """

CNCHI_VERSION = "0.14.291"
CNCHI_VERSION = "0.14.292"
CNCHI_WEBSITE = "http://www.antergos.com"
CNCHI_RELEASE_STAGE = "production"

Expand Down
11 changes: 11 additions & 0 deletions ui/check.ui
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,17 @@
<property name="position">3</property>
</packing>
</child>
<child>
<object class="StateBox" id="packaging_issues">
<property name="visible">True</property>
<property name="label">There are no packaging issues that would interfere with installation.</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">4</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
Expand Down
2 changes: 1 addition & 1 deletion update.info
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
{"version":"0.14.291","files":[
{"version":"0.14.292","files":[
]}

0 comments on commit 73626bb

Please sign in to comment.