Skip to content

Commit 5371b65

Browse files
committed
Fix --redownload=all not merging packages
Fixes #774
1 parent 3367078 commit 5371b65

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

src/download.rs

+10-6
Original file line numberDiff line numberDiff line change
@@ -372,8 +372,17 @@ pub async fn new_aur_pkgbuilds(
372372
srcinfos: &HashMap<String, Srcinfo>,
373373
) -> Result<()> {
374374
let mut pkgs = Vec::new();
375+
376+
let all_pkgs = bases
377+
.bases
378+
.iter()
379+
.map(|b| b.package_base())
380+
.collect::<Vec<_>>();
381+
375382
if config.redownload == YesNoAll::All {
376-
return aur_pkgbuilds(config, bases).await;
383+
aur_pkgbuilds(config, bases).await?;
384+
config.fetch.merge(&all_pkgs)?;
385+
return Ok(());
377386
}
378387

379388
for base in &bases.bases {
@@ -387,11 +396,6 @@ pub async fn new_aur_pkgbuilds(
387396
}
388397
}
389398

390-
let all_pkgs = bases
391-
.bases
392-
.iter()
393-
.map(|b| b.package_base())
394-
.collect::<Vec<_>>();
395399
let new_bases = Bases { bases: pkgs };
396400
aur_pkgbuilds(config, &new_bases).await?;
397401
config.fetch.merge(&all_pkgs)?;

0 commit comments

Comments
 (0)