[Salix-commits] SF.net SVN: salix:[2666] lilosetup/trunk

[<sal...@li...>]

Revision: 2666
          http://salix.svn.sourceforge.net/salix/?rev=2666&view=rev
Author:   aakuna
Date:     2011-07-12 12:20:20 +0000 (Tue, 12 Jul 2011)

Log Message:
-----------
Some code + typo correction.

Modified Paths:
--------------
    lilosetup/trunk/po/fr.po
    lilosetup/trunk/src/lilosetup.py

Modified: lilosetup/trunk/po/fr.po
===================================================================
--- lilosetup/trunk/po/fr.po	2011-07-12 11:33:38 UTC (rev 2665)
+++ lilosetup/trunk/po/fr.po	2011-07-12 12:20:20 UTC (rev 2666)
@@ -517,7 +517,7 @@
 "continue?"
 msgstr ""
 "Vous êtes sur le point d'installer un nouveau gestionnaire de démarrage "
-"LILO. Êtes vous certains de vouloir continuer ?"
+"LILO. Êtes vous certain de vouloir continuer ?"
 
 #: src/lilosetup.py:1124
 msgid ""

Modified: lilosetup/trunk/src/lilosetup.py
===================================================================
--- lilosetup/trunk/src/lilosetup.py	2011-07-12 11:33:38 UTC (rev 2665)
+++ lilosetup/trunk/src/lilosetup.py	2011-07-12 12:20:20 UTC (rev 2666)
@@ -558,7 +558,7 @@
             # Add the main partition of the os we are in
             blkid_global_output = commands.getoutput('blkid')
             if root_device_uuid != 'none' : # In which case we could otherwise be in a LiveCD
-                root_device = commands.getoutput('blkid -c /dev/null | grep ' + root_device_uuid).split()[0]
+                root_device = commands.getoutput('blkid | grep ' + root_device_uuid).split()[0]
                 for line in blkid_global_output.splitlines() :
                     if root_device_uuid in line :
                         # Check that it is a 'non-loop' device and that we are indeed in a non-live environment


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.