Merge remote-tracking branch 'origin/bugfix/bts731738-fancy-progess' into bugfix...

[apt.git] / methods / cdrom.cc

diff --git a/methods/cdrom.cc b/methods/cdrom.cc
index bc115d25946e720bf18479924fb5b8ea8c5d2c65..22d4b9164225e6575363d359be8fb006b1c0e7e5 100644 (file)
--- a/methods/cdrom.cc
+++ b/methods/cdrom.cc
@@ -16,6 +16,7 @@
 #include <apt-pkg/error.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/fileutl.h>

+#include <apt-pkg/strutl.h>

 #include <apt-pkg/hashes.h>
 
 #include <sys/stat.h>
 #include <apt-pkg/hashes.h>
 
 #include <sys/stat.h>


@@ -267,7 +268,7 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
 
    Hashes Hash;
    FileFd Fd(Res.Filename, FileFd::ReadOnly);
 
    Hashes Hash;
    FileFd Fd(Res.Filename, FileFd::ReadOnly);

-   Hash.AddFD(Fd.Fd(), Fd.Size());
+   Hash.AddFD(Fd);

    Res.TakeHashes(Hash);
 
    URIDone(Res);
    Res.TakeHashes(Hash);
 
    URIDone(Res);