summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--morphlib/plugins/branch_and_merge_plugin.py1
-rw-r--r--morphlib/plugins/tarball-systembuilder_plugin.py3
-rwxr-xr-xscripts/convert-git-cache5
-rwxr-xr-xsource-stats3
4 files changed, 3 insertions, 9 deletions
diff --git a/morphlib/plugins/branch_and_merge_plugin.py b/morphlib/plugins/branch_and_merge_plugin.py
index 88c017c8..04893184 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
diff --git a/scripts/convert-git-cache b/scripts/convert-git-cache
index 95ed83c8..33a8edf1 100755
--- a/scripts/convert-git-cache
+++ b/scripts/convert-git-cache
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# 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
@@ -15,9 +15,6 @@
# with this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-# This is a program to convert the json dump of the overlaps between artifacts
-# in a format more suited to shell programs, or human reading
-
set -eu
CACHE_ROOT=$(morph --dump-config | grep cachedir | cut -d\ -f3)
diff --git a/source-stats b/source-stats
index c246bab9..811fdc3b 100755
--- a/source-stats
+++ b/source-stats
@@ -1,5 +1,5 @@
#!/usr/bin/python
-# 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
@@ -17,7 +17,6 @@
import cliapp
import csv
-import json
import os
import shutil
import sys