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

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

Author: M0...@gm...
Date: Sat Nov 22 20:53:53 2008
New Revision: 319

Modified:
    branches/iVL/.lang/#project.pot
    branches/iVL/.lang/ClsGlobal.pot
    branches/iVL/.lang/ClsPartSel.pot
    branches/iVL/.lang/ClsWinDrives.pot
    branches/iVL/.lang/FMain.pot
    branches/iVL/.lang/FrmDiskPart.pot
    branches/iVL/.lang/FrmPartScheme.pot
    branches/iVL/.lang/FrmPartSel.pot
    branches/iVL/.lang/FrmPkgSel.pot
    branches/iVL/.lang/FrmSelISO.pot
    branches/iVL/.lang/FrmSummary.pot
    branches/iVL/.lang/FrmWinDrives.pot
    branches/iVL/.lang/MdlCore.pot
    branches/iVL/.lang/MdlDiskPart.pot
    branches/iVL/.lang/MdlObjSizer.pot
    branches/iVL/.lang/MdlPartSel.pot
    branches/iVL/.lang/MdlPkgSel.pot
    branches/iVL/.lang/MdlSetup.pot
    branches/iVL/.lang/MdlSummarize.pot
    branches/iVL/.lang/MdlWinDrives.pot
    branches/iVL/MdlLilo.module
    branches/iVL/MdlWinDrives.module

Log:
Attempt to fix lilo and windows partition detection woes

Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot	(original)
+++ branches/iVL/.lang/#project.pot	Sat Nov 22 20:53:53 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/.project
+# /home/henriquez/devel/installer/.project
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot	(original)
+++ branches/iVL/.lang/ClsGlobal.pot	Sat Nov 22 20:53:53 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/ClsGlobal.class
+# /home/henriquez/devel/installer/ClsGlobal.class
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/ClsPartSel.pot
==============================================================================
--- branches/iVL/.lang/ClsPartSel.pot	(original)
+++ branches/iVL/.lang/ClsPartSel.pot	Sat Nov 22 20:53:53 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/ClsPartSel.class
+# /home/henriquez/devel/installer/ClsPartSel.class
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/ClsWinDrives.pot
==============================================================================
--- branches/iVL/.lang/ClsWinDrives.pot	(original)
+++ branches/iVL/.lang/ClsWinDrives.pot	Sat Nov 22 20:53:53 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/ClsWinDrives.class
+# /home/henriquez/devel/installer/ClsWinDrives.class
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot	(original)
+++ branches/iVL/.lang/FMain.pot	Sat Nov 22 20:53:53 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/FMain.class
+# /home/henriquez/devel/installer/FMain.class
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot	(original)
+++ branches/iVL/.lang/FrmDiskPart.pot	Sat Nov 22 20:53:53 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/FrmDiskPart.class
+# /home/henriquez/devel/installer/FrmDiskPart.class
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/FrmPartScheme.pot
==============================================================================
--- branches/iVL/.lang/FrmPartScheme.pot	(original)
+++ branches/iVL/.lang/FrmPartScheme.pot	Sat Nov 22 20:53:53 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/FrmPartScheme.class
+# /home/henriquez/devel/installer/FrmPartScheme.class
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/FrmPartSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPartSel.pot	(original)
+++ branches/iVL/.lang/FrmPartSel.pot	Sat Nov 22 20:53:53 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/FrmPartSel.class
+# /home/henriquez/devel/installer/FrmPartSel.class
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/FrmPkgSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPkgSel.pot	(original)
+++ branches/iVL/.lang/FrmPkgSel.pot	Sat Nov 22 20:53:53 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/FrmPkgSel.class
+# /home/henriquez/devel/installer/FrmPkgSel.class
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot	(original)
+++ branches/iVL/.lang/FrmSelISO.pot	Sat Nov 22 20:53:53 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/FrmSelISO.class
+# /home/henriquez/devel/installer/FrmSelISO.class
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot	(original)
+++ branches/iVL/.lang/FrmSummary.pot	Sat Nov 22 20:53:53 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/FrmSummary.class
+# /home/henriquez/devel/installer/FrmSummary.class
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/FrmWinDrives.pot
==============================================================================
--- branches/iVL/.lang/FrmWinDrives.pot	(original)
+++ branches/iVL/.lang/FrmWinDrives.pot	Sat Nov 22 20:53:53 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/FrmWinDrives.class
+# /home/henriquez/devel/installer/FrmWinDrives.class
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/MdlCore.pot
==============================================================================
--- branches/iVL/.lang/MdlCore.pot	(original)
+++ branches/iVL/.lang/MdlCore.pot	Sat Nov 22 20:53:53 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/MdlCore.module
+# /home/henriquez/devel/installer/MdlCore.module
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/MdlDiskPart.pot
==============================================================================
--- branches/iVL/.lang/MdlDiskPart.pot	(original)
+++ branches/iVL/.lang/MdlDiskPart.pot	Sat Nov 22 20:53:53 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/MdlDiskPart.module
+# /home/henriquez/devel/installer/MdlDiskPart.module
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/MdlObjSizer.pot
==============================================================================
--- branches/iVL/.lang/MdlObjSizer.pot	(original)
+++ branches/iVL/.lang/MdlObjSizer.pot	Sat Nov 22 20:53:53 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/MdlObjSizer.module
+# /home/henriquez/devel/installer/MdlObjSizer.module
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/MdlPartSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPartSel.pot	(original)
+++ branches/iVL/.lang/MdlPartSel.pot	Sat Nov 22 20:53:53 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/MdlPartSel.module
+# /home/henriquez/devel/installer/MdlPartSel.module
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/MdlPkgSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPkgSel.pot	(original)
+++ branches/iVL/.lang/MdlPkgSel.pot	Sat Nov 22 20:53:53 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/MdlPkgSel.module
+# /home/henriquez/devel/installer/MdlPkgSel.module
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/MdlSetup.pot
==============================================================================
--- branches/iVL/.lang/MdlSetup.pot	(original)
+++ branches/iVL/.lang/MdlSetup.pot	Sat Nov 22 20:53:53 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/MdlSetup.module
+# /home/henriquez/devel/installer/MdlSetup.module
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/MdlSummarize.pot
==============================================================================
--- branches/iVL/.lang/MdlSummarize.pot	(original)
+++ branches/iVL/.lang/MdlSummarize.pot	Sat Nov 22 20:53:53 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/MdlSummarize.module
+# /home/henriquez/devel/installer/MdlSummarize.module
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/MdlWinDrives.pot
==============================================================================
--- branches/iVL/.lang/MdlWinDrives.pot	(original)
+++ branches/iVL/.lang/MdlWinDrives.pot	Sat Nov 22 20:53:53 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/MdlWinDrives.module
+# /home/henriquez/devel/installer/MdlWinDrives.module
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/MdlLilo.module
==============================================================================
--- branches/iVL/MdlLilo.module	(original)
+++ branches/iVL/MdlLilo.module	Sat Nov 22 20:53:53 2008
@@ -396,7 +396,7 @@
                              EXEC ["umount", sPartition] WAIT
                              EXEC ["mount", sPartition, sTmpMountPoint] WAIT
                      END IF
-                        IF Exist(sTmpMountPoint &/ "winnt" &/ "system32"  
&/ "winver.exe") OR IF Exist(sTmpMountPoint &/ "WINDOWS" &/ "system32"  
&/ "winver.exe") OR IF IsDir(sTmpMountPoint &/ "winnt") THEN
+                        IF Exist(sTmpMountPoint &/ "*winnt*"  
&/ "*system32*" &/ "*winver.exe*") OR IF Exist(sTmpMountPoint  
&/ "*WINDOWS*" &/ "*system32*" &/ "*winver.exe*") OR IF  
IsDir(sTmpMountPoint &/ "*winnt*") THEN
                              'Message(sPartition & " has a windows install")
                              WITH FrmLiloSetup.tsLIloTabs
                                .Index = .Count - 1

Modified: branches/iVL/MdlWinDrives.module
==============================================================================
--- branches/iVL/MdlWinDrives.module	(original)
+++ branches/iVL/MdlWinDrives.module	Sat Nov 22 20:53:53 2008
@@ -145,7 +145,8 @@
            END IF
              'we need to know if this fails. it fails on a test machine  
here with "bad partition table"
              SHELL "export s=$(parted " & Left(wintfs[i], Len("/dev/hda"))  
& " print | grep ^\'" & sBlank & sPartNo & "\'); echo $s | cut -f 4 -d \'  
\'" TO sPartsize
-            IF sPartSize.len = 0 THEN
+            'IF sPartSize.len = 0 THEN
+            IF Len(sPartsize) = 0 THEN
                sPartSize = "UNKNOWN"
              ENDIF
                tl = NEW TextLabel(FrmWinDrives.svWinDrives)