Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 0 additions & 83 deletions common/src/container.rs

This file was deleted.

1 change: 0 additions & 1 deletion common/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,3 @@ pub mod config;
pub mod flakelog;
pub mod defaults;
pub mod io;
pub mod container;
9 changes: 0 additions & 9 deletions flake-ctl/src/podman.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ use std::process::Command;
use glob::glob;
use crate::defaults;
use crate::{app, app_config};
use flakes::container::Container;
use flakes::config::get_flakes_dir;
use flakes::config::get_podman_storage_conf;
use flakes::config::read_storage_conf;
Expand All @@ -49,12 +48,10 @@ pub fn pull(uri: &String, usermode: bool) -> i32 {
if status.success() {
status
} else {
let _ = Container::podman_setup_permissions(usermode);
call.status().unwrap()
}
}
Err(_) => {
let _ = Container::podman_setup_permissions(usermode);
call.status().unwrap()
}
};
Expand Down Expand Up @@ -97,12 +94,10 @@ pub fn load(oci: &String, usermode: bool) -> i32 {
if status.success() {
status
} else {
let _ = Container::podman_setup_permissions(usermode);
call.status().unwrap()
}
}
Err(_) => {
let _ = Container::podman_setup_permissions(usermode);
call.status().unwrap()
}
};
Expand Down Expand Up @@ -139,12 +134,10 @@ pub fn rm(container: &String, usermode: bool) {
if ! status.success() {
status
} else {
let _ = Container::podman_setup_permissions(usermode);
call.status().unwrap()
}
}
Err(_) => {
let _ = Container::podman_setup_permissions(usermode);
call.status().unwrap()
}
};
Expand All @@ -167,7 +160,6 @@ pub fn mount_container(container_name: &str) -> String {
output
}
Err(_) => {
let _ = Container::podman_setup_permissions(false);
call.output().unwrap()
}
};
Expand Down Expand Up @@ -195,7 +187,6 @@ pub fn umount_container(container_name: &str) -> i32 {
output
}
Err(_) => {
let _ = Container::podman_setup_permissions(false);
call.output().unwrap()
}
};
Expand Down
Loading