Imported Upstream version 16.3.2

[platform/upstream/libzypp.git] / zypp / media / MediaCIFS.cc

diff --git a/zypp/media/MediaCIFS.cc b/zypp/media/MediaCIFS.cc
index 528dd43..b47ed44 100644 (file)
--- a/zypp/media/MediaCIFS.cc
+++ b/zypp/media/MediaCIFS.cc
@@ -123,7 +123,7 @@ namespace zypp {
      *   or the user will be promted for them via AuthenticationReport callback.
      *
      * \note The implementation currently serves both, "smb" and
-     *      and "cifs" URL's, but passes "cifs" to the mount command
+     *      and "cifs" URLs, but passes "cifs" to the mount command
      *      in any case.
      */
     void MediaCIFS::attachTo(bool next)
@@ -155,14 +155,11 @@ namespace zypp {
        return;
       }
 
-      std::string mountpoint = attachPoint().asString();
-      if( !isUseableAttachPoint(attachPoint()))
+      if( !isUseableAttachPoint( attachPoint() ) )
       {
-       mountpoint = createAttachPoint().asString();
-       if( mountpoint.empty())
-         ZYPP_THROW( MediaBadAttachPointException(url()));
-       setAttachPoint( mountpoint, true);
+       setAttachPoint( createAttachPoint(), true );
       }
+      std::string mountpoint( attachPoint().asString() );
 
       Mount mount;
       CredentialManager cm;
@@ -353,9 +350,9 @@ namespace zypp {
     //
     // DESCRIPTION : Asserted that media is attached.
     //
-    void MediaCIFS::getFile (const Pathname & filename, const ByteCount &expectedFileSize_r) const
+    void MediaCIFS::getFile (const Pathname & filename) const
     {
-      MediaHandler::getFile( filename, expectedFileSize_r );
+      MediaHandler::getFile( filename );
     }
 
     ///////////////////////////////////////////////////////////////////