fix source_validator check and
cause an error if patches are not mentioned in changelog https://progress.opensuse.org/issues/2600
This commit is contained in:
Stephan Kulow
parent
aea1b96393
commit
f21f970130
@ -5,41 +5,47 @@ use File::Temp qw/ tempdir /;
|
||||
use XML::Simple;
|
||||
use Data::Dumper;
|
||||
use Cwd;
|
||||
use Text::Diff;
|
||||
BEGIN {
|
||||
unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
|
||||
unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
|
||||
}
|
||||
use Build;
|
||||
|
||||
my $ret = 0;
|
||||
|
||||
my $old = $ARGV[0];
|
||||
my $dir = $ARGV[1];
|
||||
my $bname = basename($dir);
|
||||
|
||||
if (-f "$dir/_service") {
|
||||
my $service = XMLin("$dir/_service", ForceArray => [ 'service' ]);
|
||||
my $service = XMLin("$dir/_service", ForceArray => ['service']);
|
||||
while( my ($name, $s) = each %{$service->{service}} ) {
|
||||
my $mode = $s->{mode} || '';
|
||||
next if ($mode eq "localonly" || $mode eq "disabled");
|
||||
print "Services are only allowed if they are mode='localonly'. Please change the mode of $name and use osc service localrun\n";
|
||||
exit(1);
|
||||
$ret = 1;
|
||||
}
|
||||
# now remove it to have full service from source validator
|
||||
unlink("$dir/_service");
|
||||
}
|
||||
|
||||
if (-f "$dir/_constraints") {
|
||||
unlink("$dir/_constraints");
|
||||
unlink("$dir/_constraints");
|
||||
}
|
||||
|
||||
if (! -f "$dir/$bname.changes") {
|
||||
if (!-f "$dir/$bname.changes") {
|
||||
print "A $bname.changes is missing. Packages submitted as FooBar, need to have a FooBar.changes file with a format created by osc vc\n";
|
||||
exit(1);
|
||||
$ret = 1;
|
||||
}
|
||||
|
||||
if (! -f "$dir/$bname.spec") {
|
||||
if (!-f "$dir/$bname.spec") {
|
||||
print "A $bname.spec is missing. Packages submitted as FooBar, need to have a FooBar.spec file\n";
|
||||
exit(1);
|
||||
$ret = 1;
|
||||
}
|
||||
|
||||
# further we can't check
|
||||
exit($ret) if ($ret);
|
||||
|
||||
open(SPEC, "$dir/$bname.spec");
|
||||
my $spec = join("", <SPEC>);
|
||||
close(SPEC);
|
||||
@ -48,46 +54,47 @@ if ($spec !~ m/#\s+Copyright\s/) {
|
||||
print "$bname.spec does not appear to contain a Copyright comment. Please stick to the format\n\n";
|
||||
print "# Copyright (c) 2011 Stephan Kulow\n\n";
|
||||
print "or use osc service localrun format_spec_file\n";
|
||||
exit(1);
|
||||
$ret = 1;
|
||||
}
|
||||
|
||||
if ($spec =~ m/\nVendor:/) {
|
||||
print "$bname.spec contains a Vendor line, this is forbidden.\n";
|
||||
exit(1);
|
||||
$ret = 1;
|
||||
}
|
||||
|
||||
foreach my $file (glob("$dir/_service:*")) {
|
||||
$file=basename($file);
|
||||
print "Found _service generate file $file in checkout. Please clean this up first.";
|
||||
exit(1);
|
||||
$file=basename($file);
|
||||
print "Found _service generate file $file in checkout. Please clean this up first.";
|
||||
$ret = 1;
|
||||
}
|
||||
|
||||
# Check that we have for each spec file a changes file - and that at least one
|
||||
# contains changes
|
||||
my $changes_updated = 0;
|
||||
for my $spec (glob ("$dir/*.spec")) {
|
||||
$changes = basename ($spec);
|
||||
for my $spec (glob("$dir/*.spec")) {
|
||||
$changes = basename($spec);
|
||||
$changes =~ s/\.spec$/.changes/;
|
||||
if (! -f "$dir/$changes") {
|
||||
print "A $changes is missing. Packages submitted as FooBar, need to have a FooBar.changes file with a format created by osc vc\n";
|
||||
exit(1);
|
||||
if (!-f "$dir/$changes") {
|
||||
print "A $changes is missing. Packages submitted as FooBar, need to have a FooBar.changes file with a format created by osc vc\n";
|
||||
$ret = 1;
|
||||
}
|
||||
if (-f "$old/$changes") {
|
||||
if (system("cmp -s $old/$changes $dir/$changes")) {
|
||||
$changes_updated = 1;
|
||||
}
|
||||
} else { # a new file is an update too
|
||||
$changes_updated = 1;
|
||||
if (system("cmp -s $old/$changes $dir/$changes")) {
|
||||
$changes_updated = 1;
|
||||
}
|
||||
}
|
||||
else { # a new file is an update too
|
||||
$changes_updated = 1;
|
||||
}
|
||||
}
|
||||
if (!$changes_updated) {
|
||||
print "No changelog. Please use 'osc vc' to update the changes file(s).\n";
|
||||
exit(1);
|
||||
$ret = 1;
|
||||
}
|
||||
|
||||
if ($spec !~ m/\n%changelog\s/ && $spec != m/\n%changelog$/) {
|
||||
print "$bname.spec does not contain a %changelog line. We don't want a changelog in the spec file, but the %changelog section needs to be present\n";
|
||||
exit(1);
|
||||
$ret = 1;
|
||||
}
|
||||
|
||||
if ($spec !~ m/(#[^\n]*license)/i) {
|
||||
@ -95,84 +102,145 @@ if ($spec !~ m/(#[^\n]*license)/i) {
|
||||
print "Suggestion: use \"osc service localrun format_spec_file\" to get our default license or\n";
|
||||
print "the minimal license:\n\n";
|
||||
print "# This file is under MIT license\n";
|
||||
exit(1);
|
||||
$ret = 1;
|
||||
}
|
||||
|
||||
my %patches = ();
|
||||
|
||||
foreach my $test (glob("/usr/lib/obs/service/source_validators/*")) {
|
||||
next if (!-f "$test");
|
||||
my $checkivsd = `/bin/bash $test --batchmode --verbose $dir $old < /dev/null 2>&1`;
|
||||
my $checkivsd = `/bin/bash $test --verbose --batchmode $dir $old < /dev/null 2>&1`;
|
||||
if ($?) {
|
||||
print "Source validator failed. Try \"osc service localrun source_validator\"\n";
|
||||
print $checkivsd;
|
||||
print "\n";
|
||||
exit(1);
|
||||
print "Source validator failed. Try \"osc service localrun source_validator\"\n";
|
||||
print $checkivsd;
|
||||
print "\n";
|
||||
$ret = 1;
|
||||
}
|
||||
else {
|
||||
for my $line (split(/\n/, $checkivsd)) {
|
||||
# pimp up some warnings
|
||||
if ($line =~ m/Attention.*not mentioned/) {
|
||||
$line =~ s,\(W\) ,,;
|
||||
print "$line\n";
|
||||
$ret = 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
my $odir = getcwd();
|
||||
|
||||
chdir($dir) || "chdir $dir failed";
|
||||
for my $patch (glob("*.diff *.patch *.dif")) {
|
||||
$patches{$patch} = 'current';
|
||||
}
|
||||
chdir($odir) || die "chdir $odir failed";
|
||||
|
||||
if (-d "$old") {
|
||||
my $odir = getcwd();
|
||||
|
||||
chdir($old) || die "chdir $old failed";
|
||||
my $cf = Build::read_config("x86_64", "/usr/lib/build/configs/default.conf");
|
||||
|
||||
my %thash = ();
|
||||
my %rhash = ();
|
||||
for my $spec (glob("*.spec")) {
|
||||
my $ps = Build::Rpm::parse($cf, $spec);
|
||||
my $ps = Build::Rpm::parse($cf, $spec);
|
||||
|
||||
while (my ($k, $v) = each %$ps) {
|
||||
if ($k =~ m/^source/) {
|
||||
$thash{$v} = 1;
|
||||
}
|
||||
}
|
||||
while (my ($k, $v) = each %$ps) {
|
||||
if ($k =~ m/^source/) {
|
||||
$thash{$v} = 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
for my $patch (glob("*.diff *.patch *.dif")) {
|
||||
if ($patches{$patch}) {
|
||||
delete $patches{$patch};
|
||||
}
|
||||
else {
|
||||
$patches{$patch} = 'old';
|
||||
}
|
||||
}
|
||||
|
||||
chdir($odir) || die "chdir $odir failed";
|
||||
chdir($dir) || die "chdir $dir failed";
|
||||
for my $spec (glob("*.spec")) {
|
||||
my $ps = Build::Rpm::parse($cf, $spec);
|
||||
open(OSPEC, "$spec");
|
||||
open(NSPEC, ">$spec.new");
|
||||
while (<OSPEC>) {
|
||||
chomp;
|
||||
if (m/^Source/) {
|
||||
my $line = $_;
|
||||
$line =~ s/^(Source[0-9]*)\s*:\s*//;
|
||||
my $prefix = $1;
|
||||
my $parsedline = $ps->{lc $prefix};
|
||||
if (defined $thash{$parsedline}) {
|
||||
my $file = $line;
|
||||
my $bname = basename($file);
|
||||
print NSPEC "$prefix: $bname\n";
|
||||
} else {
|
||||
print NSPEC "$_\n";
|
||||
}
|
||||
} else {
|
||||
print NSPEC "$_\n";
|
||||
}
|
||||
}
|
||||
close(OSPEC);
|
||||
close(NSPEC);
|
||||
#system("diff -u $spec $spec.new");
|
||||
#exit(0);
|
||||
rename("$spec.new", "$spec") || die "rename failed";
|
||||
my $ps = Build::Rpm::parse($cf, $spec);
|
||||
open(OSPEC, "$spec");
|
||||
open(NSPEC, ">$spec.new");
|
||||
while (<OSPEC>) {
|
||||
chomp;
|
||||
if (m/^Source/) {
|
||||
my $line = $_;
|
||||
$line =~ s/^(Source[0-9]*)\s*:\s*//;
|
||||
my $prefix = $1;
|
||||
my $parsedline = $ps->{lc $prefix};
|
||||
if (defined $thash{$parsedline}) {
|
||||
my $file = $line;
|
||||
my $bname = basename($file);
|
||||
print NSPEC "$prefix: $bname\n";
|
||||
}
|
||||
else {
|
||||
print NSPEC "$_\n";
|
||||
}
|
||||
}
|
||||
else {
|
||||
print NSPEC "$_\n";
|
||||
}
|
||||
}
|
||||
close(OSPEC);
|
||||
close(NSPEC);
|
||||
#system("diff -u $spec $spec.new");
|
||||
#exit(0);
|
||||
rename("$spec.new", "$spec") || die "rename failed";
|
||||
}
|
||||
|
||||
chdir($odir);
|
||||
|
||||
if (%patches) {
|
||||
# parsing changes
|
||||
my $diff = diff "$old/$changes", "$dir/$changes";
|
||||
for my $line (split(/\n/, $diff)) {
|
||||
next unless $line =~ m/^+/;
|
||||
$line =~ s/^\+//;
|
||||
for my $patch (keys %patches) {
|
||||
if ($line =~ m/$patch/) {
|
||||
delete $patches{$patch};
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
# still some left?
|
||||
if (%patches) {
|
||||
$ret = 1;
|
||||
for my $patch (keys %patches) {
|
||||
# wording stolen from Raymond's declines :)
|
||||
if ($patches{$patch} eq 'current') {
|
||||
print "A patch ($patch) is being added without being properly referenced from the changelog.\n";
|
||||
}
|
||||
else {
|
||||
print "A Patch ($patch) is being deleted without this removal being referenced in the changelog.\n";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
my $odir = getcwd;
|
||||
my $tmpdir = tempdir ( "obs-XXXXXXX", TMPDIR => 1 );
|
||||
my $tmpdir = tempdir( "obs-XXXXXXX", TMPDIR => 1 );
|
||||
chdir($dir) || die 'tempdir failed';
|
||||
if (system("/usr/lib/obs/service/download_files","--enforceupstream", "yes", "--enforcelocal", "yes", "--outdir", $tmpdir)) {
|
||||
print "Source URLs are not valid. Try \"osc service localrun download_files\"\n";
|
||||
exit(1);
|
||||
$ret = 1;
|
||||
}
|
||||
chdir($odir);
|
||||
|
||||
foreach my $rpmlint (glob("$dir/*rpmlintrc")) {
|
||||
open(RPMLINTRC, $rpmlint);
|
||||
while ( <RPMLINTRC> ) {
|
||||
if ( m/^\s*setBadness/ ) {
|
||||
print "For Factory submissions, you can not use setBadness. Use filters in $rpmlint\n";
|
||||
exit(1);
|
||||
}
|
||||
while (<RPMLINTRC>) {
|
||||
if (m/^\s*setBadness/) {
|
||||
print "For Factory submissions, you can not use setBadness. Use filters in $rpmlint\n";
|
||||
$ret = 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
exit($ret);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user