pull: allow to force pull from archive

src/deb/mod.rs

@@ -129,7 +129,7 @@ mod tests {
         let package_info = crate::package_info::lookup(package, None, Some(series), "", dist, None)
             .await
             .expect("Cannot lookup package information");
-        crate::pull::pull(&package_info, Some(cwd), None)
+        crate::pull::pull(&package_info, Some(cwd), None, true)
             .await
             .expect("Cannot pull package");
         log::info!("Successfully pulled package {}", package);

src/main.rs

@@ -111,7 +111,7 @@ fn main() {
                     Some(&progress_callback),
                 )
                 .await?;
-                pkh::pull::pull(&package_info, None, Some(&progress_callback)).await
+                pkh::pull::pull(&package_info, None, Some(&progress_callback), false).await
             }) {
                 pb.finish_and_clear();
                 error!("{}", e);

src/pull.rs

@@ -341,6 +341,7 @@ pub async fn pull(
     package_info: &PackageInfo,
     cwd: Option<&Path>,
     progress: ProgressCallback<'_>,
+    force_archive: bool,
 ) -> Result<(), Box<dyn Error>> {
     let package = &package_info.stanza.package;
     let series = &package_info.series;
@@ -351,7 +352,7 @@ pub async fn pull(
     };
 
     /* Fetch the package: either via git (preferred VCS) or the archive */
-    if let Some(ref url) = package_info.preferred_vcs {
+    if let Some(ref url) = package_info.preferred_vcs && !force_archive {
         // We have found a preferred VCS (git repository) for the package, so
         // we fetch the package from that repo.
 
@@ -441,7 +442,7 @@ mod tests {
         let info = crate::package_info::lookup(package, None, series, "", dist, None)
             .await
             .unwrap();
-        pull(&info, Some(cwd), None).await.unwrap();
+        pull(&info, Some(cwd), None, false).await.unwrap();
 
         let package_dir = cwd.join(package);
         assert!(package_dir.exists());