diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2014-02-14 10:22:46 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2014-02-14 10:22:46 +0000 |
| commit | 8f8fc96b884e7f175d4a01bc2d91452d7149bf33 (patch) | |
| tree | d0d19252c154fb030f7dfa1c4784ef60e45bc40e /scripts | |
| parent | 2decdcdd27567e99e3bc53347d34064ab34f7932 (diff) | |
| parent | fbf70e2e5595d0cc7edaf7240a732cc5d2632c34 (diff) | |
| download | morph-8f8fc96b884e7f175d4a01bc2d91452d7149bf33.tar.gz | |
Merge branch 'baserock/richardmaw/S10310/invalid-repo-ref-v2'
Reviewed-by: Sam Thursfield
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/nullify-local-refs | 18 | ||||
| -rwxr-xr-x | scripts/test-morph | 10 |
2 files changed, 7 insertions, 21 deletions
diff --git a/scripts/nullify-local-refs b/scripts/nullify-local-refs deleted file mode 100755 index 5db5c587..00000000 --- a/scripts/nullify-local-refs +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/python - -import yaml, sys -repo = sys.argv[1] -ref = sys.argv[2] -for filename in sys.argv[3:]: - with open(filename, "r") as f: - d = yaml.load(f) - if "strata" in d: - for spec in d["strata"]: - if spec["repo"] == repo and spec["ref"] == ref: - spec["repo"] = spec["ref"] = None - if "build-depends" in d: - for spec in d["build-depends"]: - if spec["repo"] == repo and spec["ref"] == ref: - spec["repo"] = spec["ref"] = None - with open(filename, "w") as f: - yaml.dump(d, f) diff --git a/scripts/test-morph b/scripts/test-morph index 46d87d9f..d8480d92 100755 --- a/scripts/test-morph +++ b/scripts/test-morph @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2012,2013 Codethink Limited +# Copyright (C) 2012,2014 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 @@ -27,10 +27,12 @@ set -eu # distributed builds, which invoke morph as a sub-process. export PATH="$SRCDIR:$PATH" +WARNING_IGNORES='-W ignore:(stratum|system)\s+morphology' if [ "$1" = "--find-system-artifact" ]; then shift - "$SRCDIR/morph" --no-default-config \ + python $WARNING_IGNORES \ + "$SRCDIR/morph" --no-default-config \ --tarball-server= --cache-server= \ --cachedir-min-space=0 --tempdir-min-space=0 \ --config="$DATADIR/morph.conf" --verbose "$@" > $DATADIR/stdout @@ -46,7 +48,9 @@ if [ "$1" = "--find-system-artifact" ]; then echo $ARTIFACT else - "$SRCDIR/scripts/cmd-filter" "$SRCDIR/morph" --no-default-config \ + "$SRCDIR/scripts/cmd-filter" \ + python $WARNING_IGNORES \ + "$SRCDIR/morph" --no-default-config \ --cachedir-min-space=0 --tempdir-min-space=0 \ --tarball-server= --cache-server= \ --config="$DATADIR/morph.conf" "$@" |