diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-01-28 16:57:18 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-01-28 16:57:18 +0000 |
| commit | e97bd4be721834e24c32838c2ecd5149ef7c7101 (patch) | |
| tree | 195e2ecfa8afb38522b81ed030588eed8785017f /morphlib/plugins | |
| parent | 2024583a303ef1a79709b7ecc9fc2dce22e8ce98 (diff) | |
| parent | e6dc394c0f31429b2f54c77b20223651a0ab68ee (diff) | |
| download | morph-e97bd4be721834e24c32838c2ecd5149ef7c7101.tar.gz | |
Merge branch 'jjardon/yaml-v2'
Diffstat (limited to 'morphlib/plugins')
| -rw-r--r-- | morphlib/plugins/branch_and_merge_plugin.py | 1 | ||||
| -rw-r--r-- | morphlib/plugins/tarball-systembuilder_plugin.py | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/morphlib/plugins/branch_and_merge_plugin.py b/morphlib/plugins/branch_and_merge_plugin.py index 60e8d4ef..14dc9782 100644 --- a/morphlib/plugins/branch_and_merge_plugin.py +++ b/morphlib/plugins/branch_and_merge_plugin.py @@ -17,7 +17,6 @@ import cliapp import copy import glob -import json import logging import os import shutil diff --git a/morphlib/plugins/tarball-systembuilder_plugin.py b/morphlib/plugins/tarball-systembuilder_plugin.py index 14807924..02622067 100644 --- a/morphlib/plugins/tarball-systembuilder_plugin.py +++ b/morphlib/plugins/tarball-systembuilder_plugin.py @@ -1,4 +1,4 @@ -# Copyright (C) 2012 Codethink Limited +# Copyright (C) 2012,2013 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 @@ -14,7 +14,6 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -import json import logging import os from os.path import relpath |