bug# 1241 ,check partition, modify fstab

add a yesorno dialog when check partition: if yes,continue; if no,exit
	modified:   dialog/di_dialog.py
	modified:   interface/ri_data.py
	modified:   interface/ri_tk_cmd.py
	modified:   xml/interface.xml
This commit is contained in:
hbjia
2012-10-23 17:00:45 +08:00
parent 744dc58c5e
commit f5c38cd5b7
4 changed files with 11 additions and 14 deletions

View File

@@ -54,7 +54,7 @@ class Partition:
@staticmethod
def check_partitions():
cmd = "grep d[a-z][0-9] /proc/partitions>/dev/null"
cmd = "grep [a-zA-Z][0-9] /proc/partitions>/dev/null"
ret = os.system(cmd)
return ret

View File

@@ -1,14 +1,11 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
''' handle gui commands '''
import ri_tk as display
import tkMessageBox
import ri_widget
import ri_data
import ri_dep
import ri_func_dep
import ri_oper
from ri_oper import language
import re
import copy
import sys
@@ -35,10 +32,7 @@ def mount_list_init():
display.var_dict['mount.list'].set(value=tuple([str(i) for i in l]))
''' if disk has no partition, do this '''
ret = ri_data.Partition.check_partitions()
if ret != 0:
tkMessageBox.showerror(title='Linx', message="%s"%( language == 'chinese' and u"对不起,\
您的硬盘还没有分区,请先对硬盘分区后再进行安装操作!" or \
"Sorry, You have not patition your hard disk, please partition at first!"))
if ret != 0 and not ri_widget.MessageBox.dict["check_partitions"].show():
sys.exit(1)
def mount_quit():