Skip to content

Commit e4c8171

Browse files
committed
update_ini: show info for each version step in one message box
1 parent 24251e2 commit e4c8171

File tree

1 file changed

+34
-17
lines changed

1 file changed

+34
-17
lines changed

src/emc/ini/update_ini.py

Lines changed: 34 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -108,23 +108,40 @@ def find_section(section, inistring):
108108

109109
# Show start message with abort option
110110
if dialogs:
111-
ret = ''
112-
if version == "1.0":
113-
ret = messagebox._show("Confirm automatic update",
114-
"This version of LinuxCNC separates the concepts of Axes and "
115-
"Joints which necessitates changes to the INI and HAL files. "
116-
"The changes required are described here:\n"
117-
"http://linuxcnc.org/docs/2.9/html/ in the section "
118-
"'Getting Started with LinuxCNC' -> 'Updating LinuxCNC'\n"
119-
"The [EMC]VERSION data in your INI file indicates that your "
120-
"configuration requires update.\n"
121-
"A script exists that can attempt to automatically "
122-
"reconfigure your configuration files.\nPress 'Yes' to perform "
123-
"the conversion, 'No' to continue with the current configuration "
124-
"files or 'Cancel' to exit LinuxCNC.\n"
125-
"The process can not be automatically reversed, though a "
126-
"backup version of your entire existing config will be created.",
127-
messagebox.QUESTION, messagebox.YESNOCANCEL)
111+
message = ""
112+
if version == "$Revision$" or version < "1.0":
113+
message += "LinuxCNC 2.8: This version of LinuxCNC separates the concepts of Axes and "\
114+
"Joints which necessitates changes to the INI and HAL files. "\
115+
"The changes required are described here:\n"\
116+
"http://linuxcnc.org/docs/2.8/html/ in the section "\
117+
"'Getting Started with LinuxCNC' -> 'Updating LinuxCNC'\n\n"
118+
119+
if version < "1.1":
120+
message += "LinuxCNC 2.9: This version of LinuxCNC adds support for multiple spindles "\
121+
"which necessitates changes to the HAL files. "\
122+
"The changes required are described here:\n"\
123+
"http://linuxcnc.org/docs/2.9/html/ in the section "\
124+
"'Getting Started with LinuxCNC' -> 'Updating LinuxCNC'\n\n"
125+
126+
if version < "1.2":
127+
message += "LinuxCNC 2.10: In this version of LinuxCNC some names in "\
128+
"the configuration files have changed "\
129+
"which necessitates changes to the INI files. "\
130+
"The changes required are described here:\n"\
131+
"http://linuxcnc.org/docs/2.10/html/ in the section "\
132+
"'Getting Started with LinuxCNC' -> 'Updating LinuxCNC'\n\n"
133+
134+
message += "The [EMC]VERSION data in your INI file indicates that your "\
135+
"configuration requires update.\n"\
136+
"A script exists that can attempt to automatically "\
137+
"reconfigure your configuration files.\nPress 'Yes' to perform "\
138+
"the conversion, 'No' to continue with the current configuration "\
139+
"files or 'Cancel' to exit LinuxCNC.\n"\
140+
"The process can not be automatically reversed, though a "\
141+
"backup version of your entire existing config will be created."
142+
143+
ret = messagebox._show("Confirm automatic update", message,
144+
messagebox.QUESTION, messagebox.YESNOCANCEL)
128145
if ret == 'cancel': exit(42)
129146
elif ret == 'no': exit(0)
130147

0 commit comments

Comments
 (0)