Imported Upstream version 14.47.0

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

diff --git a/zypp/media/MediaHandler.cc b/zypp/media/MediaHandler.cc
index 90967bd..28c581b 100644 (file)
--- a/zypp/media/MediaHandler.cc
+++ b/zypp/media/MediaHandler.cc
@@ -989,8 +989,8 @@ MediaHandler::dependsOnParent(MediaAccessId parentId, bool exactIdMatch)
 //
 //     DESCRIPTION :
 //
-void MediaHandler::provideFileCopy( Pathname srcFilename,
-                                       Pathname targetFilename ) const
+void MediaHandler::provideFileCopy(Pathname srcFilename,
+                                       Pathname targetFilename , const ByteCount &expectedFileSize_r) const
 {
   if ( !isAttached() ) {
     INT << "Media not_attached on provideFileCopy(" << srcFilename
@@ -998,18 +998,18 @@ void MediaHandler::provideFileCopy( Pathname srcFilename,
     ZYPP_THROW(MediaNotAttachedException(url()));
   }
 
-  getFileCopy( srcFilename, targetFilename ); // pass to concrete handler
+  getFileCopy( srcFilename, targetFilename, expectedFileSize_r ); // pass to concrete handler
   DBG << "provideFileCopy(" << srcFilename << "," << targetFilename  << ")" << endl;
 }
 
-void MediaHandler::provideFile( Pathname filename ) const
+void MediaHandler::provideFile(Pathname filename , const ByteCount &expectedFileSize_r) const
 {
   if ( !isAttached() ) {
     INT << "Error: Not attached on provideFile(" << filename << ")" << endl;
     ZYPP_THROW(MediaNotAttachedException(url()));
   }
 
-  getFile( filename ); // pass to concrete handler
+  getFile( filename, expectedFileSize_r ); // pass to concrete handler
   DBG << "provideFile(" << filename << ")" << endl;
 }
 
@@ -1174,7 +1174,7 @@ void MediaHandler::getDirectoryYast( filesystem::DirContent & retlist,
 
   // look for directory.yast
   Pathname dirFile = dirname + "directory.yast";
-  getFile( dirFile );
+  getFile( dirFile, 0 );
   DBG << "provideFile(" << dirFile << "): " << "OK" << endl;
 
   // using directory.yast
@@ -1230,7 +1230,7 @@ ostream & operator<<( ostream & str, const MediaHandler & obj )
 //     DESCRIPTION : Asserted that media is attached.
 //                    Default implementation of pure virtual.
 //
-void MediaHandler::getFile( const Pathname & filename ) const
+void MediaHandler::getFile(const Pathname & filename , const ByteCount &) const
 {
     PathInfo info( localPath( filename ) );
     if( info.isFile() ) {
@@ -1244,9 +1244,9 @@ void MediaHandler::getFile( const Pathname & filename ) const
 }
 
 
-void MediaHandler::getFileCopy ( const Pathname & srcFilename, const Pathname & targetFilename ) const
+void MediaHandler::getFileCopy (const Pathname & srcFilename, const Pathname & targetFilename , const ByteCount &expectedFileSize_r) const
 {
-  getFile(srcFilename);
+  getFile(srcFilename, expectedFileSize_r);
 
   if ( copy( localPath( srcFilename ), targetFilename ) != 0 ) {
     ZYPP_THROW(MediaWriteException(targetFilename));