summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <lars.wirzenius@codethink.co.uk>2013-03-20 14:59:41 +0000
committerLars Wirzenius <lars.wirzenius@codethink.co.uk>2013-03-20 14:59:41 +0000
commitd9a0895320cf6ab948346afb6b58108d29667fa2 (patch)
tree0bb9ae5577ccb912dd8229290d4e4e616231a53c
parent5c21d76f241495ddb69ba00d4beed5044309b379 (diff)
parentf849b60b9218a24ea29f824edcc6d459b4f7a3ff (diff)
downloadmorph-d9a0895320cf6ab948346afb6b58108d29667fa2.tar.gz
Merge branch 'liw/detabify'
(I am not going through the normal patch review process for this.) Reviewed-by: Lars Wirzenius
-rw-r--r--morphlib/plugins/copy-artifacts_plugin.py3
-rw-r--r--scripts/.gitconfig4
2 files changed, 4 insertions, 3 deletions
diff --git a/morphlib/plugins/copy-artifacts_plugin.py b/morphlib/plugins/copy-artifacts_plugin.py
index 9cf8c147..ab51e522 100644
--- a/morphlib/plugins/copy-artifacts_plugin.py
+++ b/morphlib/plugins/copy-artifacts_plugin.py
@@ -75,7 +75,8 @@ class CopyArtifactsPlugin(cliapp.Plugin):
cliapp.runcmd(cmdline)
def find_artifacts(self, system):
- artifacts_dir = os.path.join(self.app.settings['cachedir'], 'artifacts')
+ artifacts_dir = os.path.join(
+ self.app.settings['cachedir'], 'artifacts')
artifacts = []
def find_in_system(dirname):
diff --git a/scripts/.gitconfig b/scripts/.gitconfig
index b3f6b978..a1445eb3 100644
--- a/scripts/.gitconfig
+++ b/scripts/.gitconfig
@@ -1,3 +1,3 @@
[user]
- name = morph test suite
- email = morph.tests@baserock.org
+ name = morph test suite
+ email = morph.tests@baserock.org