diff options
Diffstat (limited to 'morphlib/buildbranch.py')
| -rw-r--r-- | morphlib/buildbranch.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/morphlib/buildbranch.py b/morphlib/buildbranch.py index 2482bc9a..80cecd75 100644 --- a/morphlib/buildbranch.py +++ b/morphlib/buildbranch.py @@ -1,4 +1,4 @@ -# Copyright (C) 2013-2014 Codethink Limited +# Copyright (C) 2013-2015 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -10,8 +10,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# with this program. If not, see <http://www.gnu.org/licenses/>. import collections @@ -115,7 +114,7 @@ class BuildBranch(object): for morphology in morphologies: loader.unset_defaults(morphology) sha1 = gd.store_blob(loader.save_to_string(morphology)) - yield 0100644, sha1, morphology.filename + yield 0o100644, sha1, morphology.filename def inject_build_refs(self, loader, use_local_repos, inject_cb=lambda **kwargs: None): @@ -293,7 +292,7 @@ class BuildBranch(object): func, args, kwargs = self._cleanup.pop() try: func(*args, **kwargs) - except Exception, e: + except Exception as e: exceptions.append(e) if exceptions: raise BuildBranchCleanupError(self, exceptions) |