Hello community,
here is the log from the commit of package obs-service-source_validator for
openSUSE:Factory checked in at 2017-01-24 10:29:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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"
Changes:
--------
---
/work/SRC/openSUSE:Factory/obs-service-source_validator/obs-service-source_validator.changes
2016-08-03 11:37:17.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.obs-service-source_validator.new/obs-service-source_validator.changes
2017-01-24 10:29:10.446364650 +0100
@@ -1,0 +2,14 @@
+Wed Jan 11 13:26:20 UTC 2017 - adr...@suse.de
+
+- Update to version 0.6+git20170111.82ea590:
+ * accept reproducable CI source builds
+ * accept .obsinfo and .obscpio archives
+ * accept further modes of services
+
+-------------------------------------------------------------------
+Wed Dec 07 11:47:58 UTC 2016 - opensuse-packag...@opensuse.org
+
+- Update to version 0.6+git20161207.70e9d99:
+ * 20-files-present-and-referenced fix case where rpmbuild emits a warning
but the specfile does not list sources or patches (bnc#1013981)
+
+-------------------------------------------------------------------
Old:
----
obs-service-source_validator-0.6+git20160707.a6ff89d.tar.bz2
New:
----
obs-service-source_validator-0.6+git20170111.82ea590.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ obs-service-source_validator.spec ++++++
--- /var/tmp/diff_new_pack.IWSaGE/_old 2017-01-24 10:29:11.062277299 +0100
+++ /var/tmp/diff_new_pack.IWSaGE/_new 2017-01-24 10:29:11.066276731 +0100
@@ -1,7 +1,7 @@
#
# spec file for package obs-service-source_validator
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
Summary: An OBS source service: running all the osc source-validator
checks
License: GPL-2.0+
Group: Development/Tools/Building
-Version: 0.6+git20160707.a6ff89d
+Version: 0.6+git20170111.82ea590
Release: 0
# use osc service dr to update
Source: %{name}-%{version}.tar.bz2
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.IWSaGE/_old 2017-01-24 10:29:11.110270492 +0100
+++ /var/tmp/diff_new_pack.IWSaGE/_new 2017-01-24 10:29:11.110270492 +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">a6ff89dec94d0c3b0854dfcfb2082f552dd2b3d8</param></service></servicedata>
\ No newline at end of file
+ <param
name="changesrevision">e11c2948adf7a3ab41525203b83564587df602c7</param></service></servicedata>
\ No newline at end of file
++++++ debian.dsc ++++++
--- /var/tmp/diff_new_pack.IWSaGE/_old 2017-01-24 10:29:11.134267089 +0100
+++ /var/tmp/diff_new_pack.IWSaGE/_new 2017-01-24 10:29:11.138266521 +0100
@@ -1,6 +1,6 @@
Format: 1.0
Source: obs-service-source-validator
-Version: 0.6+git20160707.a6ff89d
+Version: 0.6+git20170111.82ea590
Binary: obs-service-source-validator
Maintainer: Hib Eris <h...@hiberis.nl>
Architecture: all
++++++ obs-service-source_validator-0.6+git20160707.a6ff89d.tar.bz2 ->
obs-service-source_validator-0.6+git20170111.82ea590.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-source_validator-0.6+git20160707.a6ff89d/20-files-present-and-referenced
new/obs-service-source_validator-0.6+git20170111.82ea590/20-files-present-and-referenced
---
old/obs-service-source_validator-0.6+git20160707.a6ff89d/20-files-present-and-referenced
2016-07-07 15:08:48.000000000 +0200
+++
new/obs-service-source_validator-0.6+git20170111.82ea590/20-files-present-and-referenced
2017-01-11 14:23:16.000000000 +0100
@@ -154,7 +154,8 @@
$RPMBUILD --nodeps -bp $TMPDIR/tmp.spec
cleanup_and_exit 1
}
- egrep -v '^warning' $TMPDIR/sources > $TMPDIR/sources.t && mv
$TMPDIR/sources.t $TMPDIR/sources
+ egrep -v '^warning' $TMPDIR/sources > $TMPDIR/sources.t
+ test $? != 2 && mv $TMPDIR/sources.t $TMPDIR/sources
done
for i in $DIR_TO_CHECK/*.dsc ; do
test -f "$i" || continue
@@ -203,9 +204,9 @@
xmllint --format $i > $TMPDIR/_service
if egrep -q "service .*mode=." $TMPDIR/_service \
- && ! egrep -q "service .*mode=.(disabled|localrun)" \
+ && ! egrep -q "service
.*mode=.(disabled|localrun|buildtime|explicit)" \
$TMPDIR/_service; then
- echo "(W) openSUSE: projects only allow 'disabled or
'localrun' services."
+ echo "(W) openSUSE: projects only allow 'disabled',
'buildtime', 'explicit' or 'localrun' services."
fi
fi
@@ -216,10 +217,6 @@
{
local file=${1##*/}
- if ! test -f "$DIR_TO_CHECK/$file"; then
- echo "(E) $file mentioned in spec file does not exist."
- return 1
- fi
if test "$OSC_MODE" = "true" ; then
if test -f "$DESTINATIONDIR/$file"; then
return 0
@@ -230,6 +227,14 @@
echo "(E) $file mentioned in spec file is not tracked."
return 1
fi
+ if ! test -f "$DIR_TO_CHECK/$file"; then
+ if test -f "$DIR_TO_CHECK/${file/\.tar\.*/}.obscpio"; then
+ # assume it will generated on builtime based of the
archive
+ return 0
+ fi
+ echo "(E) $file mentioned in spec file does not exist."
+ return 1
+ fi
}
if ! test -f "$DIR_TO_CHECK/_service"; then
@@ -398,6 +403,8 @@
.check_if_valid_source_dir | \
.setup | \
*.dsc | \
+ *.obscpio | \
+ *.obsinfo | \
ready | \
_* | \
*.orig | \
