Lubuntu/ubuntu-dev-tools
3
0
Fork 0
mirror of https://git.launchpad.net/ubuntu-dev-tools synced 2025-03-13 08:01:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prefix replacement in warning

Browse Source
This commit is contained in:
Stefano Rivera 2010-12-22 00:14:28 +02:00
parent b46114c20f
commit 0184a10c21
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ubuntutools/config.py
View File

@ -98,9 +98,12 @@ class UDTConfig(object):
else: else:
continue continue
if k in compat_keys: if k in compat_keys:
r_prefix = self.prefix
if key in self.defaults:
r_prefix = 'UBUNTUTOOLS'
print >> stderr, ( print >> stderr, (
'W: Deprecated configuration variable: %s. ' 'W: Deprecated configuration variable: %s. '
'Replaced by %s.') % (k, key) 'Replaced by %s_%s.') % (k, r_prefix, key)
return value return value
return default return default

3
ubuntutools/test/test_config.py
View File

@ -128,7 +128,8 @@ REPEAT=yes
errs = ubuntutools.config.stderr.getvalue().strip() errs = ubuntutools.config.stderr.getvalue().strip()
ubuntutools.config.stderr = StringIO() ubuntutools.config.stderr = StringIO()
self.assertEqual(len(errs.splitlines()), 1) self.assertEqual(len(errs.splitlines()), 1)
self.assertRegexpMatches(errs, r'Deprecated.*\bCOMPATFOOBAR\b.*\bQUX\b') self.assertRegexpMatches(errs,
r'Deprecated.*\bCOMPATFOOBAR\b.*\bTEST_QUX\b')
def test_boolean(self): def test_boolean(self):
config_files['user'] = "TEST_BOOLEAN=yes" config_files['user'] = "TEST_BOOLEAN=yes"