[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/kioslave/file
From:       David Faure <faure () kde ! org>
Date:       2010-10-22 18:45:11
Message-ID: 20101022184511.68FA0AC897 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1188590 by dfaure:

Fix mounting partitions as user, the "second step" wasn't done correctly (dev wasn't \
emptied, and the command line wasn't reset) Of course I debugged it before seeing \
that bug 172023 had a patch for one of the two issues...


 M  +4 -4      file.cpp  


--- trunk/KDE/kdelibs/kioslave/file/file.cpp #1188589:1188590
@@ -961,21 +961,21 @@
       error( KIO::ERR_COULD_NOT_MOUNT, i18n("Could not find program \"mount\""));
       return;
     }
-    QByteArray buffer = mountProg + ' ';
 
     // Two steps, in case mount doesn't like it when we pass all options
     for ( int step = 0 ; step <= 1 ; step++ )
     {
+        QByteArray buffer = mountProg + ' ';
         // Mount using device only if no fstype nor mountpoint (KDE-1.x like)
-        if ( !_dev.isEmpty() && _point.isEmpty() && fstype_empty )
+        if ( !dev.isEmpty() && _point.isEmpty() && fstype_empty )
             buffer += dev;
         else
           // Mount using the mountpoint, if no fstype nor device (impossible in \
                first step)
-          if ( !_point.isEmpty() && _dev.isEmpty() && fstype_empty )
+          if ( !_point.isEmpty() && dev.isEmpty() && fstype_empty )
               buffer += point;
           else
             // mount giving device + mountpoint but no fstype
-            if ( !_point.isEmpty() && !_dev.isEmpty() && fstype_empty )
+            if ( !_point.isEmpty() && !dev.isEmpty() && fstype_empty )
                 buffer += readonly + ' ' + dev + ' ' + point;
             else
               // mount giving device + mountpoint + fstype


[prev in list] [next in list] [prev in thread] [next in thread]