x/anvil
Code Issues Proposed changes

More cleanups.

Browse Source
This commit is contained in:
Joshua Harlow 2012-01-13 19:35:11 -08:00
parent 1d1f7583d1
commit 0802011c59
2 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devstack/Logger.py
View File

@ -72,8 +72,7 @@ def setupLogging():
def getLogger(name): def getLogger(name):
logger = logging.getLogger(name) return logging.getLogger(name)
return logger
#this should happen first (and once) #this should happen first (and once)

25
devstack/packaging/Apt.py
View File

@ -100,30 +100,15 @@ def _extract_version(version):
mtch = UB_PKG_VERSION_REGEX.search(version) mtch = UB_PKG_VERSION_REGEX.search(version)
if(mtch): if(mtch):
major = mtch.group(1) major = mtch.group(1)
if(major == None): major = int(major) if major != None else -1
major = -1
else:
major = int(major)
minor = mtch.group(2) minor = mtch.group(2)
if(minor == None): minor = int(minor) if minor != None else -1
minor = -1
else:
minor = int(minor)
release = mtch.group(3) release = mtch.group(3)
if(release == None): release = int(release) if release != None else -1
release = -1
else:
release = int(release)
debian_version = mtch.group(4) debian_version = mtch.group(4)
if(debian_version == None): debian_version = int(debian_version) if debian_version != None else -1
debian_version = -1
else:
debian_version = int(debian_version)
ubuntu_version = mtch.group(5) ubuntu_version = mtch.group(5)
if(ubuntu_version == None): ubuntu_version = int(ubuntu_version) if ubuntu_version != None else -1
ubuntu_version = -1
else:
ubuntu_version = int(ubuntu_version)
version_info['type'] = 'ubuntu' version_info['type'] = 'ubuntu'
version_info['major'] = major version_info['major'] = major
version_info['minor'] = minor version_info['minor'] = minor