matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Merge branch 'fix-flag-forwarding'

Browse source 
Conflicts were handled manually.

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
This commit is contained in:
Matthias Beyer 2018-11-01 00:09:29 +01:00
commit e39bd7fc72
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
bin/core/imag/src/main.rs
View file

@ -377,13 +377,20 @@ fn forward_commandline_arguments(m: &ArgMatches, scmd: &mut Vec<String>) {
debug!("Push({flag:?}, {val_name:?}, {matches:?}, {v:?}",
flag = flag, val_name = val_name, matches = m, v = v);
let _ = m
.value_of(val_name)
.map(|val| {
let flag = format!("--{}", flag.unwrap_or(val_name));
v.insert(0, String::from(val));
v.insert(0, flag);
});
if m.is_present(val_name) {
let _ = m
.value_of(val_name)
.map(|val| {
debug!("Found '{:?}' = {:?}", val_name, val);
let flag = format!("--{}", flag.unwrap_or(val_name));
v.insert(0, String::from(val));
v.insert(0, flag);
})
.unwrap_or_else(|| {
let flag = format!("--{}", flag.unwrap_or(val_name));
v.insert(0, flag);
});
}
};
push(Some("verbose"),