From f13f363460139ed4a5dfe44e8e386c0ef49d49ab Mon Sep 17 00:00:00 2001 From: David Helkowski Date: Sat, 9 May 2020 19:58:33 -0700 Subject: [PATCH] Tweak precondition checks Tweaked the precondition checks a bit so they don't complain about missing repos; which will not be present for all users upon initial run of `make`. --- check-versions.pl | 2 +- get-version-info.sh | 4 ++-- makefile_preflight.pl | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/check-versions.pl b/check-versions.pl index 935b534..e523f53 100755 --- a/check-versions.pl +++ b/check-versions.pl @@ -25,7 +25,7 @@ for my $name ( keys %$reqs ) { my $repo = $ob->{ $name }; if( !$repo ) { - #print "repos/$name is missing\n"; + print "repos/$name is missing\n"; next; } my $remote = $repo->{remote}; diff --git a/get-version-info.sh b/get-version-info.sh index 96cd9b2..bdc3669 100755 --- a/get-version-info.sh +++ b/get-version-info.sh @@ -20,9 +20,9 @@ def git_info( dir ): try: res = subprocess.check_output( cmd, stderr=subprocess.STDOUT ) except subprocess.CalledProcessError as e: - sys.stderr.write( e.output ) + #sys.stderr.write( e.output ) return { - "error": e.output + "error": "missing"#e.output } remote = subprocess.check_output( ["/usr/bin/git", "-C", "./" + dir, "remote","-v"] ) diff --git a/makefile_preflight.pl b/makefile_preflight.pl index e14bce5..1b0f956 100755 --- a/makefile_preflight.pl +++ b/makefile_preflight.pl @@ -1,4 +1,4 @@ -#!/bin/perl -w +#!/usr/bin/perl -w use strict; my $brew_check = `./util/brewser.pl checkdeps stf_ios_support.rb`; if( $brew_check =~ m/Missing/ ) {