Add some sanity checks for presence of Repos configuration

By providing an explicit fetch method in cri-getconfig which checks
things.

Without this then anything which uses cr-daily-branch produces the
rather cryptic:

    + test -f daily.xsettings
    ++ ./ap-print-url xen-unstable
    with-lock-ex ./ap-print-url: /lock: Permission denied
    + treeurl=
    FAILED rc=255

Which has caught out one or two people using standalone mode.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Reviewed-and-Tested-by: Dario Faggioli <dario.faggioli@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/README b/README
index 44e298997f561a767d5a574a4eb7be54a3e504c2..c3508a399640aa476b1fb2f98aaef5a5b8755e73 100644 (file)
--- a/README
+++ b/README
@@ -422,6 +422,11 @@ Stash
 Images
 Logs
 
+Repos              Full path to a temporary directory where repositories
+                   can be cloned. This is needed for anything which uses
+                   cr-daily-branch, including "./standalone make-flight"
+                   and "standalone-generate-dump-flight-runvars".
+
 DebianSuite
 GuestDebianSuite   defaults to DebianSuite
 

diff --git a/cri-getconfig b/cri-getconfig
index a19b900c0a10013f1071e5e508783a2555c26eb9..0589bf072937fd1e5d5a278a9bbb554f955790da 100644 (file)
--- a/cri-getconfig
+++ b/cri-getconfig
@@ -24,3 +24,18 @@ getconfig () {
                 print $c{"'$1'"} or die $!;
         '
 }
+
+getrepos() {
+       local repos=`getconfig Repos`
+       if [ -z "$repos" ] ; then
+               echo "Repos must be configured in $config" >&2
+               exit 1
+       fi
+       if [ ! -d "$repos" ] ; then
+               # Is likely an absolute path, so don't create automatically,
+               # just in case...
+               echo "Repos $repos does not exist" >&2
+               exit 1
+       fi
+       echo $repos
+}

diff --git a/cri-lock-repos b/cri-lock-repos
index 7d10c87a1cc591b2b99f01995bb85067e74fc928..c8269f35e36897ac375df339bec0b09e8d5cd19c 100644 (file)
--- a/cri-lock-repos
+++ b/cri-lock-repos
@@ -19,7 +19,7 @@
 
 . cri-common
 
-repos=`getconfig Repos`
+repos=`getrepos`
 repos_lock="$repos/lock"
 
 if [ "x$OSSTEST_REPOS_LOCK_LOCKED" != "x$repos_lock" ]; then

diff --git a/standalone b/standalone
index 17fa40cb960881c6f7c8b338bc3e12dc077fd68a..b5c97c8913555b27c9c46d68527980086d1b7ec2 100755 (executable)
--- a/standalone
+++ b/standalone
@@ -142,6 +142,12 @@ need_host() {
     fi
 }
 
+check_repos() {
+    # We don't care about the answer, just the error checking and
+    # logging to stderr.
+    OSSTEST_CONFIG=$config getrepos >/dev/null
+}
+
 ensure_logs() {
     if [ ! -d "logs" ] ; then
        mkdir "logs"
@@ -171,6 +177,7 @@ case $op in
        ;;
 
     make-flight)
+        check_repos
         need_flight
 
         if [ $# -lt 1 ] ; then