From ec6c7e9dfa7b7aa8fb395691dbd79a4f2240e29a Mon Sep 17 00:00:00 2001 From: Amit Kucheria Date: Thu, 22 Jan 2009 12:36:16 +0200 Subject: [PATCH] UBUNTU: Really skip abi check when requested I fail to see the point of providing the previous and current abi files for a flavour or arch when I have chosen to ignore the abi Signed-off-by: Amit Kucheria --- debian/scripts/abi-check | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/scripts/abi-check b/debian/scripts/abi-check index abef5f7..63f73af 100755 --- a/debian/scripts/abi-check +++ b/debian/scripts/abi-check @@ -10,6 +10,7 @@ my $skipabi = shift; my $fail_exit = 1; my $EE = "EE:"; my $errors = 0; +my $abiskip = 0; my $count; @@ -19,6 +20,7 @@ if (-f "$prev_abidir/ignore" or -f "$prev_abidir/$flavour.ignore" or "$skipabi" eq "true") { print "WW: Explicitly asked to ignore ABI, running in no-fail mode\n"; $fail_exit = 0; + $abiskip = 1; $EE = "WW:"; } @@ -32,8 +34,9 @@ if (not -f "$abidir/$flavour" or not -f "$prev_abidir/$flavour") { print "EE: Previous or current ABI file missing!\n"; print " $abidir/$flavour\n" if not -f "$abidir/$flavour"; print " $prev_abidir/$flavour\n" if not -f "$prev_abidir/$flavour"; - # Always fail here. This is bad - exit(1); + # Exit if we haven't been asked to ignore abi + if ("$abiskip" eq "0") + exit(1); } my %symbols; -- 1.5.6.3