[Vectorlinux-devel] [vinstall-ng commit] r419 - in branches/iVL: . .lang

[<cod...@go...>]

Author: M0...@gm...
Date: Tue Dec 16 13:16:03 2008
New Revision: 419

Modified:
    branches/iVL/.lang/FrmSummary.pot
    branches/iVL/.lang/MdlWinDrives.pot
    branches/iVL/FrmSummary.class
    branches/iVL/MdlWinDrives.module

Log:
Fixed bug in windows partition listing

Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot	(original)
+++ branches/iVL/.lang/FrmSummary.pot	Tue Dec 16 13:16:03 2008
@@ -74,27 +74,27 @@
  msgid "Do not mount"
  msgstr ""

-#: FrmSummary.class:178
+#: FrmSummary.class:179
  msgid "Package Name"
  msgstr ""

-#: FrmSummary.class:187
+#: FrmSummary.class:188
  msgid "BULK PACKAGES"
  msgstr ""

-#: FrmSummary.class:214
+#: FrmSummary.class:215
  msgid "USER-SELECTED PACKAGES"
  msgstr ""

-#: FrmSummary.class:293
+#: FrmSummary.class:294
  msgid "Installation Type"
  msgstr ""

-#: FrmSummary.class:303
+#: FrmSummary.class:304
  msgid "Partition Selection Scheme"
  msgstr ""

-#: FrmSummary.class:313
+#: FrmSummary.class:314
  msgid "Software Selection"
  msgstr ""


Modified: branches/iVL/.lang/MdlWinDrives.pot
==============================================================================
--- branches/iVL/.lang/MdlWinDrives.pot	(original)
+++ branches/iVL/.lang/MdlWinDrives.pot	Tue Dec 16 13:16:03 2008
@@ -26,11 +26,11 @@
  msgid "MOUNT TO"
  msgstr ""

-#: MdlWinDrives.module:124
+#: MdlWinDrives.module:125
  msgid "Do not mount"
  msgstr ""

-#: MdlWinDrives.module:141
+#: MdlWinDrives.module:142
  msgid "No Windows partitions detected"
  msgstr ""


Modified: branches/iVL/FrmSummary.class
==============================================================================
--- branches/iVL/FrmSummary.class	(original)
+++ branches/iVL/FrmSummary.class	Tue Dec 16 13:16:03 2008
@@ -128,15 +128,15 @@
                  IF tl.tag = cb.tag THEN
                    sSize = Mid(tl.text, InStr(tl.text, "["), Len(tl.text) -  
RInStr(tl.text, "["))
                    sSize = Trim(Replace(sSize, "[", ""))
-                  sSize = Replace(sSize, "GB", "")
-                  sSize = Replace(sSize, "MB", "")
+                  'sSize = Replace(sSize, "GB", "")
+                  'sSize = Replace(sSize, "MB", "")
                  END IF

                NEXT

              'sFsType = "Windows"
                'SHELL "l=$(probepart | grep " & cb.tag & "); echo $l | cut  
-f 6,7 -d \' \'" TO sFsType
-              SHELL "probepart | grep ^" & "\'" & cb.Tag & " \'| tr -s \'  
\'\"\" | cut -f 7-8 -d \' \'" TO sFsType
+              SHELL "probepart | grep ^" & "\'" & cb.Tag & " \'| tr -s \'  
\'\"\" | cut -f 6-8 -d \' \'" TO sFsType
                sFsType = Trim(sFsType)

              WITH ME
@@ -149,6 +149,7 @@
              .GridView1[irow, 3].text = sMountPnt
              .GridView1[irow, 3].BackColor = Color.LightGray
              .GridView1[irow, 4].Text = ("No")
+            .GridView1[irow, 4].BackColor = Color.LightGray
            END WITH
          INC irow
        END IF

Modified: branches/iVL/MdlWinDrives.module
==============================================================================
--- branches/iVL/MdlWinDrives.module	(original)
+++ branches/iVL/MdlWinDrives.module	Tue Dec 16 13:16:03 2008
@@ -101,7 +101,8 @@
            IF Len(sPartNo) < 1 THEN
              BREAK
            ENDIF
-            SHELL "export s=$(parted " & Left(sDisks[i], Len("/dev/hda"))  
& " print | grep ^\'" & sBlank & sPartNo & "\'); echo $s | cut -f 4 -d \'  
\'" TO sPartsize
+            'SHELL "export s=$(parted " & Left(sDisks[i], Len("/dev/hda"))  
& " print | grep ^\'" & sBlank & sPartNo & "\'); echo $s | cut -f 4 -d \'  
\'" TO sPartsize
+            SHELL "parted " & Left(sDisks[i], Len("/dev/hda")) & " print |  
grep ^\'" & sBlank & sPartNo & "\' | tr -s \' \'\"\" | cut -f 5 -d ' '" TO  
sPartsize
                tl = NEW TextLabel(FrmWinDrives.svWinDrives)
                  WITH tl
                  .y = y