package_downloader: Always call download callbacks

The download callbacks were not called in case the source and destination of locally available downloaded file were the same.
rpm-software-management · Aug 14, 2024 · 3aebdbb · 3aebdbb
1 parent 1e83b07
commit 3aebdbb
Showing 1 changed file with 14 additions and 9 deletions.
diff --git a/libdnf5/repo/package_downloader.cpp b/libdnf5/repo/package_downloader.cpp
@@ -156,20 +156,25 @@ void PackageDownloader::download() try {
             std::filesystem::path source = pkg_target.package.get_package_path();
             std::filesystem::path destination = pkg_target.destination / source.filename();
             std::error_code ec;
-            if (!std::filesystem::equivalent(source, destination, ec)) {
+            const bool same_file = std::filesystem::equivalent(source, destination, ec);
+            if (!same_file) {
                 std::filesystem::copy(source, destination, std::filesystem::copy_options::overwrite_existing, ec);
-                if (auto * download_callbacks = pkg_target.package.get_base()->get_download_callbacks()) {
-                    std::string msg;
-                    DownloadCallbacks::TransferStatus status;
-                    if (ec) {
-                        status = DownloadCallbacks::TransferStatus::ERROR;
-                        msg = ec.message();
+            }
+            if (auto * download_callbacks = pkg_target.package.get_base()->get_download_callbacks()) {
+                std::string msg;
+                DownloadCallbacks::TransferStatus status;
+                if (ec) {
+                    status = DownloadCallbacks::TransferStatus::ERROR;
+                    msg = ec.message();
+                } else {
+                    status = DownloadCallbacks::TransferStatus::ALREADYEXISTS;
+                    if (same_file) {
+                        msg = "Already downloaded";
                     } else {
-                        status = DownloadCallbacks::TransferStatus::ALREADYEXISTS;
                         msg = fmt::format("Copied from {}", source.string());
                     }
-                    download_callbacks->end(pkg_target.user_cb_data, status, msg.c_str());
                 }
+                download_callbacks->end(pkg_target.user_cb_data, status, msg.c_str());
             }
             continue;
         }