diff options
-rwxr-xr-x | bitbake/bin/bitbake-setup | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bitbake/bin/bitbake-setup b/bitbake/bin/bitbake-setup index 8ceacada9a..1fbb65494b 100755 --- a/bitbake/bin/bitbake-setup +++ b/bitbake/bin/bitbake-setup | |||
@@ -635,11 +635,11 @@ def load_settings(top_dir, non_interactive): | |||
635 | settings_path = default_settings_path(top_dir) | 635 | settings_path = default_settings_path(top_dir) |
636 | settings = configparser.ConfigParser() | 636 | settings = configparser.ConfigParser() |
637 | print('Loading settings from\n {}\n'.format(settings_path)) | 637 | print('Loading settings from\n {}\n'.format(settings_path)) |
638 | settings.read([settings_path]) | 638 | settings.read_file(open(settings_path)) |
639 | return settings | 639 | return settings |
640 | 640 | ||
641 | def global_settings_path(args): | 641 | def global_settings_path(args): |
642 | return args.global_settings if args.global_settings else os.path.join(os.path.expanduser('~'), '.config', 'bitbake-setup', 'config') | 642 | return os.path.abspath(args.global_settings) if args.global_settings else os.path.join(os.path.expanduser('~'), '.config', 'bitbake-setup', 'config') |
643 | 643 | ||
644 | def write_global_settings(settings_path, force_replace, non_interactive=True): | 644 | def write_global_settings(settings_path, force_replace, non_interactive=True): |
645 | if not os.path.exists(settings_path) or force_replace: | 645 | if not os.path.exists(settings_path) or force_replace: |
@@ -673,7 +673,7 @@ def load_global_settings(settings_path, non_interactive): | |||
673 | 673 | ||
674 | settings = configparser.ConfigParser() | 674 | settings = configparser.ConfigParser() |
675 | print('Loading global settings from\n {}\n'.format(settings_path)) | 675 | print('Loading global settings from\n {}\n'.format(settings_path)) |
676 | settings.read([settings_path]) | 676 | settings.read_file(open(settings_path)) |
677 | return settings | 677 | return settings |
678 | 678 | ||
679 | def change_settings(top_dir, new_settings): | 679 | def change_settings(top_dir, new_settings): |