Hello community,
here is the log from the commit of package obs-service-source_validator for
openSUSE:Factory checked in at 2015-06-12 20:29:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
2015-05-16 07:12:21.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.obs-service-source_validator.new/obs-service-source_validator.changes
2015-06-12 20:29:36.000000000 +0200
@@ -1,0 +2,16 @@
+Thu Jun 11 08:58:17 UTC 2015 - [email protected]
+
+- Update to version 0.5+git20150611.b85a5d4:
+ + unbreak source validator with packages using source services again
+ * Not all _* files are xml
+ * Don't complain about service generated files
+
+-------------------------------------------------------------------
+Wed May 27 13:54:35 UTC 2015 - [email protected]
+
+- Update to version 0.5+git20150527.6e08ec8:
+ + baselibs.conf: ignore lines starting with #; comments might be welcome
+ + baselibs.conf: 'arch' is also a valid keyword
+ + Avoid trashing _service file
+
+-------------------------------------------------------------------
Old:
----
obs-service-source_validator-0.5+git20150513.7c2f7ae.tar.bz2
New:
----
obs-service-source_validator-0.5+git20150611.b85a5d4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ obs-service-source_validator.spec ++++++
--- /var/tmp/diff_new_pack.oYujfy/_old 2015-06-12 20:29:37.000000000 +0200
+++ /var/tmp/diff_new_pack.oYujfy/_new 2015-06-12 20:29:37.000000000 +0200
@@ -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.5+git20150513.7c2f7ae
+Version: 0.5+git20150611.b85a5d4
Release: 0
# use osc service dr to update
Source: %{name}-%{version}.tar.bz2
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.oYujfy/_old 2015-06-12 20:29:37.000000000 +0200
+++ /var/tmp/diff_new_pack.oYujfy/_new 2015-06-12 20:29:37.000000000 +0200
@@ -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">7c2f7ae62322ff5293567d70bfa4904568296a11</param></service></servicedata>
\ No newline at end of file
+ <param
name="changesrevision">b85a5d4b92edd871e77b4af202967ee6290e6d88</param></service></servicedata>
\ No newline at end of file
++++++ obs-service-source_validator-0.5+git20150513.7c2f7ae.tar.bz2 ->
obs-service-source_validator-0.5+git20150611.b85a5d4.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-source_validator-0.5+git20150513.7c2f7ae/20-files-present-and-referenced
new/obs-service-source_validator-0.5+git20150611.b85a5d4/20-files-present-and-referenced
---
old/obs-service-source_validator-0.5+git20150513.7c2f7ae/20-files-present-and-referenced
2015-05-13 10:54:32.000000000 +0200
+++
new/obs-service-source_validator-0.5+git20150611.b85a5d4/20-files-present-and-referenced
2015-06-11 10:58:17.000000000 +0200
@@ -176,23 +176,27 @@
# XML validate files starting with _..
if [ -x $(type -p xmllint) ]; then
- # Check if _service is sane
- if [ -f $DIR_TO_CHECK/_service ]; then
- xmllint --format $DIR_TO_CHECK/_service > $TMPDIR/_service
-
- if egrep -q "service .*mode=." $TMPDIR/_service \
- && ! egrep -q "service .*mode=.(disabled|localrun)" \
- $TMPDIR/_service; then
- echo "(W) openSUSE: projects only allow 'disabled or 'localrun'
services."
- fi
- fi
-
- for i in $DIR_TO_CHECK/_*; do
+ for i in $DIR_TO_CHECK/_service; do
test -f $i || continue
+ BASE=${i##*/}
+
xmllint --format $i >/dev/null || {
echo "(E) $(basename $i) is not valid XML"
RETURN=2
+ continue
}
+
+ # Check if _service is sane
+ if [ "$BASE" = "_service" ]; then
+ xmllint --format $i > $TMPDIR/_service
+
+ if egrep -q "service .*mode=." $TMPDIR/_service \
+ && ! egrep -q "service .*mode=.(disabled|localrun)" \
+ $TMPDIR/_service; then
+ echo "(W) openSUSE: projects only allow 'disabled or
'localrun' services."
+ fi
+ fi
+
done
fi
@@ -216,9 +220,11 @@
fi
}
-for HASTOBETHER in `cat $TMPDIR/sources` ; do
- check_tracked "$HASTOBETHER" || RETURN=2
-done
+if ! test -f "$DIR_TO_CHECK/_service"; then
+ for HASTOBETHER in `cat $TMPDIR/sources` ; do
+ check_tracked "$HASTOBETHER" || RETURN=2
+ done
+fi
#
# Verify GPG keys
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-source_validator-0.5+git20150513.7c2f7ae/70-baselibs
new/obs-service-source_validator-0.5+git20150611.b85a5d4/70-baselibs
--- old/obs-service-source_validator-0.5+git20150513.7c2f7ae/70-baselibs
2015-05-13 10:47:14.000000000 +0200
+++ new/obs-service-source_validator-0.5+git20150611.b85a5d4/70-baselibs
2015-06-11 10:58:17.000000000 +0200
@@ -21,8 +21,8 @@
BUILTBINARIES=($(rpm -q --qf "%{name}\n" --specfile $DIR_TO_CHECK/*.spec))
# add 'targettype' as a 'known keyword' to not trip over it
-BUILTBINARIES+=('targettype')
-BASELIBSREF=$(grep -o "^\\S\+" $DIR_TO_CHECK/baselibs.conf)
+BUILTBINARIES+=('targettype' 'arch')
+BASELIBSREF=$(grep -o "^[a-zA-Z0-9.+_-]\+" $DIR_TO_CHECK/baselibs.conf)
RETURN=0
for rpm in $BASELIBSREF; do
