Author: M0...@gm...
Date: Fri Mar 20 11:30:20 2009
New Revision: 518
Modified:
branches/speedy/.lang/.pot
branches/speedy/.lang/Step6.pot
branches/speedy/Step6.class
Log:
Fixed bug in partition listing caused by extended partitions
Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot (original)
+++ branches/speedy/.lang/.pot Fri Mar 20 11:30:20 2009
@@ -582,11 +582,11 @@
msgid "This step cannot be undone. Are you sure you want to continue?"
msgstr ""
-#: Step3a1a.class:186 Step6.class:503 Step7a.class:143
+#: Step3a1a.class:186 Step6.class:507 Step7a.class:143
msgid "Yes"
msgstr ""
-#: Step3a1a.class:186 Step6.class:503 Step7a.class:143
+#: Step3a1a.class:186 Step6.class:507 Step7a.class:143
msgid "No"
msgstr ""
@@ -851,35 +851,35 @@
msgid "File System"
msgstr ""
-#: Step6.class:144
+#: Step6.class:148
msgid "Swap"
msgstr ""
-#: Step6.class:144
+#: Step6.class:148
msgid "Not Used"
msgstr ""
-#: Step6.class:185 Step8.class:74
+#: Step6.class:189 Step8.class:74
msgid "Do not format"
msgstr ""
-#: Step6.class:230
+#: Step6.class:234
msgid "You have already selected"
msgstr ""
-#: Step6.class:230
+#: Step6.class:234
msgid "as your"
msgstr ""
-#: Step6.class:230
+#: Step6.class:234
msgid "partition."
msgstr ""
-#: Step6.class:230
+#: Step6.class:234
msgid "Please select only one partition for this purpose"
msgstr ""
-#: Step6.class:398
+#: Step6.class:402
msgid "Select which partitions to use for installation"
msgstr ""
Modified: branches/speedy/.lang/Step6.pot
==============================================================================
--- branches/speedy/.lang/Step6.pot (original)
+++ branches/speedy/.lang/Step6.pot Fri Mar 20 11:30:20 2009
@@ -30,43 +30,43 @@
msgid "File System"
msgstr ""
-#: Step6.class:144
+#: Step6.class:148
msgid "Swap"
msgstr ""
-#: Step6.class:144
+#: Step6.class:148
msgid "Not Used"
msgstr ""
-#: Step6.class:185
+#: Step6.class:189
msgid "Do not format"
msgstr ""
-#: Step6.class:230
+#: Step6.class:234
msgid "You have already selected"
msgstr ""
-#: Step6.class:230
+#: Step6.class:234
msgid "as your"
msgstr ""
-#: Step6.class:230
+#: Step6.class:234
msgid "partition."
msgstr ""
-#: Step6.class:230
+#: Step6.class:234
msgid "Please select only one partition for this purpose"
msgstr ""
-#: Step6.class:398
+#: Step6.class:402
msgid "Select which partitions to use for installation"
msgstr ""
-#: Step6.class:503
+#: Step6.class:507
msgid "Yes"
msgstr ""
-#: Step6.class:503
+#: Step6.class:507
msgid "No"
msgstr ""
Modified: branches/speedy/Step6.class
==============================================================================
--- branches/speedy/Step6.class (original)
+++ branches/speedy/Step6.class Fri Mar 20 11:30:20 2009
@@ -101,19 +101,23 @@
DIM sDisks, sPartitions, sPartLine AS String[]
DIM sDisk, sPartNo, sSize, sFs AS String
DIM i, ii, irow AS Integer
+ DIM hproc AS Process
objFS = NEW Object[]
objMntPoints = NEW Object[]
INC ME.gvPartListing.Rows.Count
irow = 2
- SHELL "probedisk | grep -v cdrom | cut -f 1 -d \'|\'" TO sDump ' This
gets the list of present hard drisks
+ SHELL "probedisk | grep -vi rom | cut -f 1 -d \'|\'" TO sDump ' This
gets the list of present hard drisks
sDisks = Split(Trim(sDump), "\n")
FOR i = 0 TO sDisks.Count - 1
- SHELL "parted " & Trim(sDisks[i]) & " print | grep \"^ [0-9]\" |
tr -s \' \',\"\"" TO sDump
+ 'hproc = SHELL "parted " & Trim(sDisks[i]) & " print | grep \"^
[0-9]\" | tr -s \' \',\"\"" ' just to test'
+ 'IF hproc.Value > 0 THEN CONTINUE
+ SHELL "parted " & Trim(sDisks[i]) & " print | grep \"^
[0-9]\" | grep -vi \"extended\" | tr -s \' \',\"\"" TO sDump
spartitions = Split(Trim(sdump), "\n")
FOR ii = 0 TO spartitions.count - 1
sPartLine = Split(Trim(spartitions[ii]), " ")
+ 'Message(spartitions[ii])
sPartNo = sPartLine[0]
sSize = sPartLine[3]
sFs = sPartLine[5]
@@ -247,7 +251,7 @@
y = LAST.y
-
+ IF LAST.text = ("Swap") THEN RETURN
IF LAST.text <> ("Not Used") THEN
IF ME.CheckEntry(LAST.text, gvPartListing.RowAt(LAST.y)) > 0 THEN
LAST.text = ("Not Used")
|
