diff options
| author |   Devan Franchini <twitch153@gentoo.org> | 2015-05-16 22:51:31 -0400 |
|---|---|---|
| committer | Devan Franchini <twitch153@gentoo.org> | 2015-06-19 15:51:47 -0400 |
| commit | 04c567f09d9230f65fbe37ccd29789c6d010dec5 (patch) | |
| tree | 215466db61a44f3ea38fde24a25a2319b0898d27 | |
| parent | config.py: Allows for -lui to not have any arguments passed (diff) | |
| download | webapp-config-04c567f09d9230f65fbe37ccd29789c6d010dec5.tar.gz webapp-config-04c567f09d9230f65fbe37ccd29789c6d010dec5.tar.bz2 webapp-config-04c567f09d9230f65fbe37ccd29789c6d010dec5.zip | |
config.py: Message clean ups
| -rw-r--r-- | WebappConfig/config.py | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/WebappConfig/config.py b/WebappConfig/config.py index 37c2982..8d6a0ae 100644 --- a/WebappConfig/config.py +++ b/WebappConfig/config.py @@ -1001,7 +1001,8 @@ class Config: if len(args) > 1: argsvr = args[1].split('.') if len(argsvr) == 1: - OUT.die('Invalid package version: %(pvr)s' % {'pvr': args[1]}) + OUT.die('Invalid package version: %(pvr)s' + % {'pvr': args[1]}) pvr = '' for i in range(0, len(argsvr)): @@ -1384,17 +1385,15 @@ class Config: # upgrade # okay - what do we have? - - OUT.info('Removing ' - + old['WEB_CATEGORY'] + '/' - + old['WEB_PN'] + '-' - + old['WEB_PVR'] + ' from ' - + self.installdir() + '\n' - + ' Installed by ' - + old['WEB_INSTALLEDBY'] + ' on ' - + old['WEB_INSTALLEDDATE'] + '\n' - +' Config files owned by ' - + old['WEB_INSTALLEDFOR'], 1) + msg = 'Removing ' + if old['WEB_CATEGORY']: + msg += old['WEB_CATEGORY'] + '/' + msg += old['WEB_PN'] + '-' + old['WEB_PVR'] + ' from '\ + + self.installdir() + '\n Installed by '\ + + old['WEB_INSTALLEDBY'] + ' on ' + old['WEB_INSTALLEDDATE']\ + + '\n Config files owned by ' + old['WEB_INSTALLEDFOR'] + + OUT.info(msg, 1) content = self.create_content(old['WEB_CATEGORY'], old['WEB_PN'], old['WEB_PVR']) content.read() |