Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 617744 | Differences between
and this patch

Collapse All | Expand All

(-)a/src/bootstrap/flags.rs (-9 / +8 lines)
Lines 242-252 Arguments: Link Here
242
        let cwd = t!(env::current_dir());
242
        let cwd = t!(env::current_dir());
243
        let paths = matches.free[1..].iter().map(|p| cwd.join(p)).collect::<Vec<_>>();
243
        let paths = matches.free[1..].iter().map(|p| cwd.join(p)).collect::<Vec<_>>();
244
244
245
        let cfg_file = matches.opt_str("config").map(PathBuf::from).or_else(|| {
246
            if fs::metadata("config.toml").is_ok() {
247
                Some(PathBuf::from("config.toml"))
248
            } else {
249
                None
250
            }
251
        });
245
252
246
        // All subcommands can have an optional "Available paths" section
253
        // All subcommands can have an optional "Available paths" section
247
        if matches.opt_present("verbose") {
254
        if matches.opt_present("verbose") {
248
            let flags = Flags::parse(&["build".to_string()]);
255
            let flags = Flags::parse(&["build".to_string()]);
249
            let mut config = Config::default();
256
            let mut config = Config::parse(&flags.build, cfg_file.clone());
250
            config.build = flags.build.clone();
257
            config.build = flags.build.clone();
251
            let mut build = Build::new(flags, config);
258
            let mut build = Build::new(flags, config);
252
            metadata::build(&mut build);
259
            metadata::build(&mut build);
Lines 307-320 Arguments: Link Here
307
        };
314
        };
308
315
309
316
310
        let cfg_file = matches.opt_str("config").map(PathBuf::from).or_else(|| {
311
            if fs::metadata("config.toml").is_ok() {
312
                Some(PathBuf::from("config.toml"))
313
            } else {
314
                None
315
            }
316
        });
317
318
        let mut stage = matches.opt_str("stage").map(|j| j.parse().unwrap());
317
        let mut stage = matches.opt_str("stage").map(|j| j.parse().unwrap());
319
318
320
        if matches.opt_present("incremental") {
319
        if matches.opt_present("incremental") {

Return to bug 617744