i18n
jan Michal 2 years ago
parent 2dd35ac6c2
commit 495e6359e9

@ -53,17 +53,28 @@ pub fn aur_install(a: Vec<String>, options: Options) {
pkg, pkg,
rpcres.package.as_ref().unwrap().depends.join(", ") rpcres.package.as_ref().unwrap().depends.join(", ")
)); ));
log(format!(
"Raw makedepends for package {} are:\n{:?}",
pkg,
rpcres.package.as_ref().unwrap().make_depends.join(", ")
));
} }
// dep sorting // dep sorting
info("Sorting dependencies".to_string()); info("Sorting dependencies".to_string());
let sorted = crate::internal::sort(&rpcres.package.as_ref().unwrap().depends, options); let sorted = crate::internal::sort(&rpcres.package.as_ref().unwrap().depends, options);
info("Sorting make dependencies".to_string());
let md_sorted = crate::internal::sort(&rpcres.package.as_ref().unwrap().make_depends, options);
if verbosity >= 1 { if verbosity >= 1 {
log(format!( log(format!(
"Sorted dependencies for {} are:\n{:?}", "Sorted dependencies for {} are:\n{:?}",
pkg, &sorted pkg, &sorted
)); ));
log(format!(
"Sorted makedepends for {} are:\n{:?}",
pkg, &md_sorted
));
} }
let newopts = Options { let newopts = Options {
@ -72,7 +83,7 @@ pub fn aur_install(a: Vec<String>, options: Options) {
asdeps: true, asdeps: true,
}; };
if !sorted.nf.is_empty() { if !sorted.nf.is_empty() || !md_sorted.nf.is_empty() {
crash( crash(
format!( format!(
"Could not find dependencies {} for package {}, aborting", "Could not find dependencies {} for package {}, aborting",
@ -108,9 +119,11 @@ pub fn aur_install(a: Vec<String>, options: Options) {
info("Moving on to install dependencies".to_string()); info("Moving on to install dependencies".to_string());
if !sorted.repo.is_empty() { if !sorted.repo.is_empty() {
crate::operations::install(sorted.repo, newopts); crate::operations::install(sorted.repo, newopts);
crate::operations::install(md_sorted.repo, newopts);
} }
if !sorted.aur.is_empty() { if !sorted.aur.is_empty() {
crate::operations::aur_install(sorted.aur, newopts); crate::operations::aur_install(sorted.aur, newopts);
crate::operations::aur_install(md_sorted.aur, newopts);
} }
let mut makepkg_args = vec!["-rsic", "--needed"]; let mut makepkg_args = vec!["-rsic", "--needed"];

Loading…
Cancel
Save