Fixed module installation error, for real.

2010-08-17 22:32:22 -07:00
parent dd2a2442c4
commit 59d326295f
2 changed files with 13 additions and 12 deletions
@@ -37,7 +37,7 @@ def moduleDeps( subtract=None, add=None ):
            info( '*** Removing ' + mod + '\n' )
            rmmodOutput = rmmod( mod )
            if rmmodOutput:
-                error( 'Error removing ' + mod + '\n%s' % rmmodOutput )
+                error( 'Error removing ' + mod + ': %s\n' % rmmodOutput )
                exit( 1 )
            if mod in lsmod():
                error( 'Failed to remove ' + mod + '; still there!\n' )
@@ -47,9 +47,8 @@ def moduleDeps( subtract=None, add=None ):
            info( '*** Loading ' + mod + '\n' )
            modprobeOutput = modprobe( mod )
            if modprobeOutput:
-                error( 'Error inserting ' + mod + ';\n See INSTALL.\n%s' %
-                       modprobeOutput )
-                exit( 1 )
+                error( 'Error inserting ' + mod + '- is it installed?\n' +
+                    'Error was: %s\n' % modprobeOutput )
            if mod not in lsmod():
                error( 'Failed to insert ' + mod + '\n' )
                exit( 1 )