before index-conflict changes
This commit is contained in:
@ -1,15 +1,14 @@
|
||||
use std::fs;
|
||||
use std::path::{Path,PathBuf};
|
||||
use crate::utils::parser;
|
||||
|
||||
|
||||
pub fn delete(repo: &String, pkgname: &String) {
|
||||
super::disable::disable(&repo, &pkgname).unwrap();
|
||||
fs::remove_dir_all(PathBuf::from("/pkg").join(&repo).join(&pkgname)).unwrap();
|
||||
fs::remove_dir_all(super::get_aeropkg_base().join(&repo).join(&pkgname)).unwrap();
|
||||
}
|
||||
|
||||
pub fn delete_recursive(repo: &String, pkgname: &String) {
|
||||
let pkg_dir = Path::new("/pkg").join(repo).join(pkgname);
|
||||
let pkg_dir = super::get_aeropkg_base().join(repo).join(pkgname);
|
||||
|
||||
if pkg_dir.exists() {
|
||||
let var_path = super::get_var_path();
|
||||
@ -20,9 +19,9 @@ pub fn delete_recursive(repo: &String, pkgname: &String) {
|
||||
for dependency in deps.lines() {
|
||||
let dependency = dependency.trim();
|
||||
if !dependency.is_empty() {
|
||||
let pkg_dir = Path::new("/pkg").join(repo).join(dependency);
|
||||
let pkg_dir = super::get_aeropkg_base().join(repo).join(dependency);
|
||||
if pkg_dir.exists() {
|
||||
if !parser::get_use_status(repo, dependency) {
|
||||
if !parser::pkginfo::get_use_status(repo, dependency) {
|
||||
delete(repo, &dependency.to_string())
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user