Hello community,
here is the log from the commit of package obs-service-source_validator for
openSUSE:Factory checked in at 2017-12-29 18:46:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/obs-service-source_validator (Old)
and /work/SRC/openSUSE:Factory/.obs-service-source_validator.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "obs-service-source_validator"
Fri Dec 29 18:46:49 2017 rev:43 rq:558812 version:0.9
Changes:
--------
---
/work/SRC/openSUSE:Factory/obs-service-source_validator/obs-service-source_validator.changes
2017-12-03 10:10:01.586394670 +0100
+++
/work/SRC/openSUSE:Factory/.obs-service-source_validator.new/obs-service-source_validator.changes
2017-12-29 18:46:55.293619089 +0100
@@ -1,0 +2,7 @@
+Mon Dec 11 16:14:46 UTC 2017 - [email protected]
+
+- Update to version 0.9:
+ * fixes boo#1072375
+ * check *_source.changes if they are valid debian source change files
+
+-------------------------------------------------------------------
Old:
----
obs-service-source_validator-0.7.tar.bz2
New:
----
obs-service-source_validator-0.9.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ obs-service-source_validator.spec ++++++
--- /var/tmp/diff_new_pack.5Bqzxf/_old 2017-12-29 18:46:56.713211378 +0100
+++ /var/tmp/diff_new_pack.5Bqzxf/_new 2017-12-29 18:46:56.717210230 +0100
@@ -21,7 +21,7 @@
License: GPL-2.0+
Group: Development/Tools/Building
Url: https://github.com/openSUSE/obs-service-source_validator
-Version: 0.7
+Version: 0.9
Release: 0
# use osc service dr to update
Source: %{name}-%{version}.tar.bz2
++++++ _service ++++++
--- /var/tmp/diff_new_pack.5Bqzxf/_old 2017-12-29 18:46:56.757198745 +0100
+++ /var/tmp/diff_new_pack.5Bqzxf/_new 2017-12-29 18:46:56.757198745 +0100
@@ -8,8 +8,8 @@
<param name="versionformat">0.7+git%cd.%h</param>
<param name="revision">master</param>
-->
- <param name="version">0.7</param>
- <param name="revision">0.7</param>
+ <param name="version">0.9</param>
+ <param name="revision">0.9</param>
<param name="changesgenerate">enable</param>
</service>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.5Bqzxf/_old 2017-12-29 18:46:56.781191854 +0100
+++ /var/tmp/diff_new_pack.5Bqzxf/_new 2017-12-29 18:46:56.785190706 +0100
@@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param
name="url">git://github.com/openSUSE/obs-service-source_validator.git</param>
- <param
name="changesrevision">1e990f00f4a78d58f1c4252f52ce63c48747f08a</param></service></servicedata>
\ No newline at end of file
+ <param
name="changesrevision">f009de22f0533ea8bf2e7c12fd2be8953eabcf74</param></service></servicedata>
\ No newline at end of file
++++++ debian.dsc ++++++
--- /var/tmp/diff_new_pack.5Bqzxf/_old 2017-12-29 18:46:56.809183815 +0100
+++ /var/tmp/diff_new_pack.5Bqzxf/_new 2017-12-29 18:46:56.813182666 +0100
@@ -1,6 +1,6 @@
Format: 1.0
Source: obs-service-source-validator
-Version: 0.7-0
+Version: 0.9-0
Binary: obs-service-source-validator
Maintainer: Hib Eris <[email protected]>
Architecture: all
++++++ obs-service-source_validator-0.7.tar.bz2 ->
obs-service-source_validator-0.9.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-service-source_validator-0.7/40-sequence-changes
new/obs-service-source_validator-0.9/40-sequence-changes
--- old/obs-service-source_validator-0.7/40-sequence-changes 2017-11-16
13:29:35.000000000 +0100
+++ new/obs-service-source_validator-0.9/40-sequence-changes 2017-12-11
13:08:22.000000000 +0100
@@ -15,6 +15,10 @@
RETURN=0
for i in $DIR_TO_CHECK/*.changes ; do
test -f $i || continue
+ if [ $i != ${i%_source.changes} ];then
+
/usr/lib/obs/service/source_validators/helpers/check_debian_source_changes $i
&& continue
+ echo "(W) File ends with '_source.changes' but is not a valid debian
source changes file"
+ fi
RETURN=0
test -n "$FIRST_CHANGES" || FIRST_CHANGES=$i
if test -n "$FIRST_CHANGES" -a "$FIRST_CHANGES" != "$i" ; then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-source_validator-0.7/helpers/DebianSourceChangesValidator.pm
new/obs-service-source_validator-0.9/helpers/DebianSourceChangesValidator.pm
---
old/obs-service-source_validator-0.7/helpers/DebianSourceChangesValidator.pm
1970-01-01 01:00:00.000000000 +0100
+++
new/obs-service-source_validator-0.9/helpers/DebianSourceChangesValidator.pm
2017-12-11 13:08:22.000000000 +0100
@@ -0,0 +1,21 @@
+package DebianSourceChangesValidator;
+
+use strict;
+use warnings;
+
+sub validate {
+ my ($fname) = @_;
+ my @mandatory = qw/Format Date Source Binary Architecture Version
Distribution Maintainer Description Changes Checksums-Sha1 Checksums-Sha256
Files/;
+ my $re = '^('.join('|',@mandatory).'):.*';
+ my $result = {};
+
+ open(my $fh,$fname) || die "Could not open '$fname': $!\n";
+ while (my $line = <$fh>) { $line =~ m/$re/ && $result->{$1}++ }
+ close $fh;
+
+ for my $key (@mandatory) { return 1 if (! $result->{$key} ) }
+
+ return 0
+}
+
+1;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-source_validator-0.7/helpers/check_debian_source_changes
new/obs-service-source_validator-0.9/helpers/check_debian_source_changes
--- old/obs-service-source_validator-0.7/helpers/check_debian_source_changes
1970-01-01 01:00:00.000000000 +0100
+++ new/obs-service-source_validator-0.9/helpers/check_debian_source_changes
2017-12-11 13:08:22.000000000 +0100
@@ -0,0 +1,12 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+
+BEGIN { unshift(@::INC,'/usr/lib/obs/service/source_validators/helpers/') }
+
+use DebianSourceChangesValidator;
+
+my $ev = DebianSourceChangesValidator::validate($ARGV[0]);
+
+exit $ev;