diff options
author | Jun Wang <junbill.wang@samsung.com> | 2016-01-28 04:32:24 +0800 |
---|---|---|
committer | Jun Wang <junbill.wang@samsung.com> | 2016-01-28 04:34:48 +0800 |
commit | 745a0eca470a22efa96ed2cf762daa583cb172ed (patch) | |
tree | a9f661706118bf6a5828a3aeaaa27d7d53c14175 /gbp/scripts/import_srpm.py | |
parent | 84c67ab58e4bb5e7d9dae77cf8251ed0a45ff017 (diff) | |
download | git-buildpackage-745a0eca470a22efa96ed2cf762daa583cb172ed.tar.gz git-buildpackage-745a0eca470a22efa96ed2cf762daa583cb172ed.tar.bz2 git-buildpackage-745a0eca470a22efa96ed2cf762daa583cb172ed.zip |
Fix some errors of merging
Change-Id: I4441fb369aa88598f238c41710edeba01cd537b6
Diffstat (limited to 'gbp/scripts/import_srpm.py')
-rwxr-xr-x | gbp/scripts/import_srpm.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/gbp/scripts/import_srpm.py b/gbp/scripts/import_srpm.py index 7a397fe9..85f1225f 100755 --- a/gbp/scripts/import_srpm.py +++ b/gbp/scripts/import_srpm.py @@ -197,8 +197,6 @@ def parse_args(argv): parser.add_config_file_option(option_name="color-scheme", dest="color_scheme") parser.add_config_file_option(option_name="tmp-dir", dest="tmp_dir") - parser.add_config_file_option(option_name="vendor", action="store", - dest="vendor") parser.add_option("--download", action="store_true", dest="download", default=False, help="download source package") parser.add_config_file_option(option_name="vendor", action="store", |