From 05f41b326febc6bc379c214d2ae54a0f7cc8331e Mon Sep 17 00:00:00 2001
From: Lars Wirzenius <lars.wirzenius@codethink.co.uk>
Date: Tue, 28 Aug 2012 14:38:32 +0100
Subject: Set $USER etc for CVS test setup script

---
 lorry.morph                   | 1 +
 tests/cvs-single-commit.setup | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/lorry.morph b/lorry.morph
index 818b5d6..69de4fd 100644
--- a/lorry.morph
+++ b/lorry.morph
@@ -3,6 +3,7 @@
     "kind": "chunk",
     "build-commands": [
         "git branch -a",
+        "cat tests/cvs-single-commit.script",
         "bzr whoami 'Lorry test suite <baserock-dev@baserock.org>'",
         "python setup.py check",
         "python setup.py build"
diff --git a/tests/cvs-single-commit.setup b/tests/cvs-single-commit.setup
index c94f07c..537de81 100755
--- a/tests/cvs-single-commit.setup
+++ b/tests/cvs-single-commit.setup
@@ -20,6 +20,11 @@
 
 set -e
 
+# CVS wants $USER, $LOGNAME, and $LOGNAME set to a real username.
+export USER=root
+export LOGNAME=$USER
+export USERNAME=$USER
+
 # create the repository
 repo="$DATADIR/cvs-test-repo"
 export CVSROOT="$repo"
-- 
cgit v1.2.1