Skip to content

Commit bf35cab

Browse files
committed
Fix pkgbuild review
1 parent e9799e9 commit bf35cab

File tree

2 files changed

+19
-5
lines changed

2 files changed

+19
-5
lines changed

src/install.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1578,8 +1578,6 @@ fn print_dir(
15781578
let c = config.color;
15791579
let has_pkgbuild = path.join("PKGBUILD").exists();
15801580

1581-
println!("{:?} {:?}", path, has_pkgbuild);
1582-
15831581
for file in read_dir(path).with_context(|| tr!("failed to read dir: {}", path.display()))? {
15841582
let file = file?;
15851583

@@ -1655,7 +1653,7 @@ fn print_dir(
16551653
Ok(())
16561654
}
16571655

1658-
fn review(config: &Config, fetch: &aur_fetch::Fetch, pkgs: &[&str]) -> Result<()> {
1656+
pub fn review(config: &Config, fetch: &aur_fetch::Fetch, pkgs: &[&str]) -> Result<()> {
16591657
if pkgs.is_empty() {
16601658
return Ok(());
16611659
}

src/pkgbuild.rs

+18-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use std::{
77
sync::Arc,
88
};
99

10-
use crate::{download::print_download, exec};
10+
use crate::{download::print_download, exec, install::review};
1111
use anyhow::{anyhow, bail, Context, Result};
1212
use aur_fetch::Fetch;
1313
use indicatif::{ProgressBar, ProgressStyle};
@@ -215,7 +215,7 @@ impl PkgbuildRepo {
215215
return Ok(());
216216
}
217217

218-
log::debug!("for each pkgbuild: {}", path.display());
218+
//log::debug!("for each pkgbuild: {}", path.display());
219219

220220
if path.join("PKGBUILD").exists() {
221221
f(path, data)?;
@@ -362,6 +362,22 @@ impl PkgbuildRepos {
362362
pb.finish();
363363
}
364364

365+
let review_repos = repos
366+
.iter()
367+
.filter(|r| {
368+
!config
369+
.pkgbuild_repos
370+
.repo(&r.name)
371+
.map(|r| r.skip_review)
372+
.unwrap_or(false)
373+
})
374+
.map(|r| r.name.as_str())
375+
.collect::<Vec<_>>();
376+
review(config, &self.fetch, &review_repos)?;
377+
378+
let all_repos = repos.iter().map(|r| r.name.as_str()).collect::<Vec<_>>();
379+
self.fetch.merge(&all_repos)?;
380+
365381
self.repos.iter().for_each(|r| r.generate_srcinfos(config));
366382
Ok(())
367383
}

0 commit comments

Comments
 (0)