openstack/kolla-ansible
Code Issues Proposed changes

Fixes the last of the hacking based pep8 errors

Browse Source 
Change-Id: I628c6cd493c112b00d8202725456c3fb863f5446
Partially-Implements: blueprint enable-flake8
This commit is contained in:
Borne Mace 2015-07-10 12:38:18 -07:00
parent 0953f57d6a
commit fa63119f96
1 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tools/build.py
View File

@ -1,5 +1,17 @@
#!/usr/bin/env python #!/usr/bin/env python
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# TODO(SamYaple): Allow image pushing # TODO(SamYaple): Allow image pushing
# TODO(SamYaple): Single image building w/ optional parent building # TODO(SamYaple): Single image building w/ optional parent building
# TODO(SamYaple): Build only missing images # TODO(SamYaple): Build only missing images
@ -41,7 +53,7 @@ class WorkerThread(Thread):
self.queue.task_done() self.queue.task_done()
except Queue.Empty: except Queue.Empty:
break break
except: except Exception:
traceback.print_exc() traceback.print_exc()
self.queue.task_done() self.queue.task_done()
@ -49,7 +61,8 @@ class WorkerThread(Thread):
print('Processing:', image['name']) print('Processing:', image['name'])
image['status'] = "building" image['status'] = "building"
if image['parent'] != None and image['parent']['status'] == "error": if (image['parent'] is not None and
image['parent']['status'] == "error"):
image['status'] = "parent_error" image['status'] = "parent_error"
return return
@ -108,7 +121,7 @@ def argParser():
return vars(parser.parse_args()) return vars(parser.parse_args())
class KollaWorker(): class KollaWorker(object):
def __init__(self, args): def __init__(self, args):
self.kolla_dir = os.path.join(sys.path[0], '..') self.kolla_dir = os.path.join(sys.path[0], '..')
@ -216,7 +229,8 @@ class KollaWorker():
self.images.append(image) self.images.append(image)
def buildQueues(self): def buildQueues(self):
""" """Organizes Queue list
Return a list of Queues that have been organized into a hierarchy Return a list of Queues that have been organized into a hierarchy
based on dependencies based on dependencies
""" """