Hello community, here is the log from the commit of package osc-source_validator for openSUSE:Factory checked in at Thu Apr 14 09:38:49 CEST 2011. -------- --- osc-source_validator/osc-source_validator.changes 2011-04-04 13:15:28.000000000 +0200 +++ /mounts/work_src_done/STABLE/osc-source_validator/osc-source_validator.changes 2011-04-12 16:41:33.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Apr 12 16:40:58 CEST 2011 - ro@suse.de + +- activate the patches_applied check for real, + errors out if errors found + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ osc-source_validator.spec ++++++ --- /var/tmp/diff_new_pack.ZBsbh9/_old 2011-04-14 09:38:24.000000000 +0200 +++ /var/tmp/diff_new_pack.ZBsbh9/_new 2011-04-14 09:38:24.000000000 +0200 @@ -19,7 +19,7 @@ Name: osc-source_validator Version: 0.1 -Release: 10 +Release: 12 License: GPLv2+ Summary: osc source validator Url: http://en.opensuse.org/openSUSE:Build_Service_Tools#OSC_source_validator ++++++ osc-source_validator-0.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-source_validator-0.1/30-patches-applied new/osc-source_validator-0.1/30-patches-applied --- old/osc-source_validator-0.1/30-patches-applied 2011-04-04 13:13:05.000000000 +0200 +++ new/osc-source_validator-0.1/30-patches-applied 2011-04-12 16:39:54.000000000 +0200 @@ -15,7 +15,7 @@ test "$VERBOSE" = true && echo -n "." RETURN=0 # WARNING only at the moment, just complain loudly ... - /usr/lib/osc/source_validators/helpers/check_patches_applied $BATCHMODE $i || echo "########## HAD ERRORS ##########" + /usr/lib/osc/source_validators/helpers/check_patches_applied $BATCHMODE $i || RETURN=1 done test "$VERBOSE" = true && echo "done" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-source_validator-0.1/helpers/check_patches_applied new/osc-source_validator-0.1/helpers/check_patches_applied --- old/osc-source_validator-0.1/helpers/check_patches_applied 2011-04-04 13:13:05.000000000 +0200 +++ new/osc-source_validator-0.1/helpers/check_patches_applied 2011-04-12 16:39:54.000000000 +0200 @@ -9,6 +9,7 @@ my $filename = $ARGV[0]; $filename =~ s/^.*\///g; my @PATCHES; +my @PATCHES_COMMENTED; my @APPLIED; my $errors = 0; @@ -25,6 +26,7 @@ while (<>) { if (/^(#\s*)?[Pp]atch[0-9\s]*:/) { my ($front,$back) = split(":",$_,2); + my $commented = ($front =~ /^#/) ? 1 : 0; $front =~ s/^(#\s*)?[Pp]atch//; $front =~ s/\s*$//; $front = 0 unless $front; @@ -32,6 +34,7 @@ $back =~ s/^\s*//; $back =~ s/^.*\///g; $PATCHES[$front] = $back; + $PATCHES_COMMENTED[$front] = 1 if $commented; next; } if (/^(#.*)?%[Pp]atch/) { @@ -90,6 +93,10 @@ print STDERR "$col_yel(W) $filename: patch $i $PATCHES[$i]: mentioned in specfile but not applied via %patch$col_norm\n"; next; } + if ($PATCHES_COMMENTED[$i]) { + print STDERR "$col_yel(W) $filename: patch $i $PATCHES[$i]: is commented out$col_norm\n"; + next; + } print STDERR "$col_red(E) $filename: patch $i $PATCHES[$i] apparently not applied (or not applied via %patch)$col_norm\n"; $errors++; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org