Merge branch 'hugang'

interface/check_oldconf.py

@@ -13,11 +13,11 @@ message['chinese'] = '系统检测到存在上次安装保留的配置文件，
 
 
 def ok():
-    cmd='rm -rf ' + ins_xml
-    subprocess.Popen(cmd,shell=True)
     root.destroy()
 
 def cancel():
+    cmd='rm -rf ' + ins_xml
+    subprocess.Popen(cmd,shell=True)
     root.destroy()
 
 def init(language):

interface/ri_tk_cmd.py

@@ -9,13 +9,13 @@ import re
 import copy
 import sys
 
-def serial_no_init(w):
+def serial_no_init(w=''):
     display.var_dict['serial_no.number'].set(value=ri_data.SerialNumber.value)
 
 def serial_no_quit():
     ri_data.SerialNumber.value = display.var_dict['serial_no.number'].get()
 
-def mount_list_init(w):
+def mount_list_init(w=''):
     ''' initialize mount list '''
     ri_data.MountPoint.init_from_internal()
     l = []
@@ -33,7 +33,7 @@ def mount_list_modify(*args):
     tw = ri_widget.TopWindow.dict['mount_list_modify']
     tw.show()
 
-def mp_top_init(w):
+def mp_top_init(w=''):
     ''' mount dir top window initialize '''
     ml_win = ri_widget.Widget.dict['mount.list'].tk_widget
     idxs = ml_win.curselection()
@@ -90,7 +90,7 @@ def mp_top_cancel():
     ri_widget.TopWindow.dict['mount_list_modify'].hide()
     pass
 
-def network_init(w):
+def network_init(w=''):
     ''' network initialize '''
     display.var_dict['network_host_name'].    set(value=ri_data.Network.hostname)
     ri_widget.Widget.dict['network_config_%s' %(ri_data.Network.configuration and ri_data.Network.configuration or 'static')].tk_widget.invoke()
@@ -146,7 +146,7 @@ class GroupCheck(GroupButton):
         if v.get() == 'yes':
             display.SoftwarePackageWindow.dict[self.name].show()
 
-def software_group_mandatory_construct(w):
+def software_group_mandatory_construct(w=''):
     ''' construct widgets based actual data
 w - Widget instance '''
     mdt = [ m for m in ri_data.Group.dict.values() if m.install == 'mandatory' ]
@@ -163,7 +163,7 @@ w - Widget instance '''
         wi.attr['command'] = vn
         w.add_sub_widget(wi)
 
-def software_group_optional_construct(w):
+def software_group_optional_construct(w=''):
     ''' construct widgets based actual data
 w - Widget instance '''
     opt = [ o for o in ri_data.Group.dict.values() if o.install != 'mandatory' ]
@@ -191,7 +191,7 @@ def software_group_optional_quit():
         i.install = display.var_dict[vn].get()
         print i.name, i.install
 
-def dependency_list_init(w):
+def dependency_list_init(w=''):
     ''' init function for list in dependency step '''
     ri_dep.construct_depending()
     ri_dep.resolve_recursive_depending()
@@ -200,7 +200,7 @@ def dependency_list_init(w):
     l = [ k.ljust(20) + ': ' + ' '.join(dep_dict[k]) for k in dep_dict.keys()]
     display.var_dict['dependency.list'].set(value=tuple(l))
 
-def service_construct(w):
+def service_construct(w=''):
     ''' construct service widget based on actual data
 w - Widget instance '''
 
@@ -220,7 +220,7 @@ w - Widget instance '''
         wi.grid_location.dict['row']    = idx / int(w.grid_management.columns)
         w.add_sub_widget(wi)
 
-def service_init(w):
+def service_init(w=''):
     ''' initialize service checkboxes, based on package selection '''
     # first refresh service state
     ri_data.Service.change_state()
@@ -238,7 +238,7 @@ def service_quit():
             vn = "service_%s" %(i.name)
             i.start = display.var_dict[vn].get()
 
-def raid_raw_init(w):
+def raid_raw_init(w=''):
     ''' initialize raid raw devices (parttion with id 'fd' '''
     global raid_raw_initialized
     if not raid_raw_initialized:
@@ -283,7 +283,7 @@ def raid_spare_to_raw():
     ''' move device from spare to raw '''
     list_to_list('raid_spare.list', 'raid_spare_devs', 'raid_raw_devs')
 
-def raid_device_init(w):
+def raid_device_init(w=''):
     ''' initialize raid device list '''
     raid_devs = [ r.device for r in ri_data.Raid.list ]
     display.var_dict['raid_devs'].set(value=tuple(raid_devs))
@@ -357,7 +357,7 @@ def raid_device_list_detail(*args):
 
 raid_raw_initialized = False
 
-def install_information_init(w):
+def install_information_init(w=''):
     '''install information initialize'''
     ins_info = ri_data.install_information()
     w.insert(1.0,ins_info)

xml/interface.xml

@@ -722,7 +722,6 @@ row 4 |                                                            |
     </widget>
   </widget>
 
-  <message_box name='check_old_conf' type='askokcancel' title='check old config' message='#check-old-config'/>
   <message_box name='next' type='askokcancel' title='install sequence' message='#installation-confirmation'/>
   <message_box name='previous' type='showinfo' title='install sequence' message='#first-step'/>
   <message_box name='raid_add_warning' type='showwarning' title='raid adding' message='#raid-add-warning'/>
@@ -860,11 +859,6 @@ row 4 |                                                            |
     <Chinese>您已到达第一步。</Chinese>
   </text>
 
-  <text key='#last-step'>
-    <English>You have already been in the last step.</English>
-    <Chinese>您已到达最后一步。</Chinese>
-  </text>
-
   <text key='#NCM'>
     <English>Network Configuration Management:</English>
     <Chinese>网络配置方式</Chinese>
@@ -895,13 +889,6 @@ row 4 |                                                            |
     <Chinese>安装配置完成，按确定键开始安装</Chinese>
   </text>
   
-  <text key='#check-old-config'>
-    <English>The system detects the presence of the last installation to retain the configuration file, whether to use</English>
-    <Chinese>系统检测到存在上次安装保留的配置文件，是否使用它</Chinese>
-   </text>
-
-
-
   <text>
     <English>Active</English>
     <Chinese>活动</Chinese>