summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Holland <richard.holland@codethink.co.uk>2013-04-08 11:46:04 +0000
committerRichard Holland <richard.holland@codethink.co.uk>2013-04-08 14:46:57 +0000
commit7c5487a695ab8353e9e98116a7165722cdd9f61e (patch)
tree2a7668291a6d60ff539bc63b58ed0108273add5b
parent2bcce901633013484c22936ed4477d9a908a4cbb (diff)
downloadmorph-7c5487a695ab8353e9e98116a7165722cdd9f61e.tar.gz
Corrections to previous commits
Removed trailing comma, corrected copyright year, used #pragma: no cover to exclude the exception class form coverage and allow ./check full to run.
-rw-r--r--morphlib/builder2.py2
-rwxr-xr-xtests.build/empty-stratum.script4
2 files changed, 3 insertions, 3 deletions
diff --git a/morphlib/builder2.py b/morphlib/builder2.py
index 9382efe9..7ded281e 100644
--- a/morphlib/builder2.py
+++ b/morphlib/builder2.py
@@ -857,6 +857,6 @@ class DiskImageBuilder(SystemKindBuilder): # pragma: no cover
class EmptyStratumError(cliapp.AppException):
- def __init__(self, stratum_name):
+ def __init__(self, stratum_name): # pragma: no cover
cliapp.AppException.__init__(self,
"Stratum %s is empty (has no dependencies)" % stratum_name)
diff --git a/tests.build/empty-stratum.script b/tests.build/empty-stratum.script
index 13c9b7b4..6856b2bd 100755
--- a/tests.build/empty-stratum.script
+++ b/tests.build/empty-stratum.script
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright (C) 2011-2013 Codethink Limited
+# Copyright (C) 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
@@ -26,7 +26,7 @@ git checkout --quiet -b empty-stratum
cat <<EOF > hello-stratum.morph
{
"name": "hello-stratum",
- "kind": "stratum",
+ "kind": "stratum"
}
EOF
sed -i 's/master/empty-stratum/' hello-system.morph