Mercurial > treepkg > treepkg
comparison treepkg/readconfig.py @ 513:3e08d6546d52
set option value to None and not "None"
| author | Bjoern Ricks <bricks@intevation.de> |
|---|---|
| date | Wed, 10 Nov 2010 09:24:48 +0000 |
| parents | e5b66539f893 |
| children | f2de1c162d30 |
comparison
equal
deleted
inserted
replaced
| 512:6d4778487728 | 513:3e08d6546d52 |
|---|---|
| 65 | 65 |
| 66 | 66 |
| 67 packager_desc = [ | 67 packager_desc = [ |
| 68 "name", "base_dir", | 68 "name", "base_dir", |
| 69 ("url", str, ""), | 69 ("url", str, ""), |
| 70 ("svn_url", str, ""), | 70 ("svn_url", str, None), |
| 71 ("svn_subset", convert_subversion_subset, ""), | 71 ("svn_subset", convert_subversion_subset, ""), |
| 72 ("svn_externals", shlex.split, ""), | 72 ("svn_externals", shlex.split, ""), |
| 73 ("rules_url", str, ""), ("packager_class", str, "treepkg.packager"), | 73 ("rules_url", str, ""), ("packager_class", str, "treepkg.packager"), |
| 74 ("root_cmd", shlex.split, "sudo"), "builderconfig", | 74 ("root_cmd", shlex.split, "sudo"), "builderconfig", |
| 75 "deb_email", "deb_fullname", ("deb_build_options", str, ""), | 75 "deb_email", "deb_fullname", ("deb_build_options", str, ""), |
| 114 value = default_value | 114 value = default_value |
| 115 else: | 115 else: |
| 116 print >>sys.stderr, "Missing option %r in section %r" \ | 116 print >>sys.stderr, "Missing option %r in section %r" \ |
| 117 % (key, section) | 117 % (key, section) |
| 118 sys.exit(1) | 118 sys.exit(1) |
| 119 options[key] = converter(value) | 119 if value is None: |
| 120 options[key] = value | |
| 121 else: | |
| 122 options[key] = converter(value) | |
| 120 return options | 123 return options |
| 121 | 124 |
| 122 | 125 |
| 123 def read_config(filename): | 126 def read_config(filename): |
| 124 """Reads the tree packager configuration from the file given by filename. | 127 """Reads the tree packager configuration from the file given by filename. |