Hello community,
here is the log from the commit of package obs-service-source_validator for
openSUSE:Factory checked in at 2013-08-13 10:16: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
2013-07-07 22:19:36.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.obs-service-source_validator.new/obs-service-source_validator.changes
2013-08-13 10:16:10.000000000 +0200
@@ -1,0 +2,11 @@
+Tue Aug 6 12:34:53 UTC 2013 - dmuel...@suse.com
+
+- update to latest git:
+ 2b2c89d also check for orphan files when _services are used
+ 197b519 Check the Buildservice magic files (_link/_service)
+ with xmllint
+ a6d922c Cleanup keyring check
+ f936138 removed the incorrect basename checking, also do not look
+ for .gpg files as we currently use either .sig or .asc
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ obs-service-source_validator-0.3.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-source_validator-0.3/20-files-present-and-referenced
new/obs-service-source_validator-0.3/20-files-present-and-referenced
--- old/obs-service-source_validator-0.3/20-files-present-and-referenced
2013-06-18 17:44:58.000000000 +0200
+++ new/obs-service-source_validator-0.3/20-files-present-and-referenced
2013-08-06 14:32:22.000000000 +0200
@@ -182,27 +182,42 @@
# Verify GPG keys
#
-shopt -s failglob
-if echo $DIR_TO_CHECK/*keyring 2>/dev/null ; then
- shopt -u failglob
- gpg --no-default-keyring --keyring
$TMPDIR/.checkifvalidsourcedir-gpg-keyring --import $DIR_TO_CHECK/*.keyring
- shopt -s nullglob
- for i in $DIR_TO_CHECK/*.sig $DIR_TO_CHECK/*.asc ; do
- gpg --no-default-keyring --keyring
$TMPDIR/.checkifvalidsourcedir-gpg-keyring "$i" || {
- echo "(E) signature $i does not validate"
- RETURN=2
- }
- done
- rm $TMPDIR/.checkifvalidsourcedir-gpg-keyring
+if [ -f $DIR_TO_CHECK/*.keyring 2>/dev/null ]; then
+ gpg -q --no-default-keyring --keyring
$TMPDIR/.checkifvalidsourcedir-gpg-keyring --import $DIR_TO_CHECK/*.keyring
+ for i in $DIR_TO_CHECK/*.sig $DIR_TO_CHECK/*.asc; do
+ if [ -f "$i" ]; then
+ gpg -q --no-default-keyring --keyring
$TMPDIR/.checkifvalidsourcedir-gpg-keyring "$i" || {
+ echo "(E) signature $i does not validate"
+ RETURN=2
+ }
+ fi
+ done
+ rm $TMPDIR/.checkifvalidsourcedir-gpg-keyring
fi
-#
-# Skip this test for now, if we have server side downloads
-#
-if [ -e $DIR_TO_CHECK/_service ]; then
- exit 0
+# XML validate files starting with _..
+if [ -x $(type -p xmllint) ]; then
+ for i in $DIR_TO_CHECK/_*; do
+ test -f $i || continue
+ xmllint --format $i >/dev/null || {
+ echo "(E) $(basename $i) is not valid XML"
+ RETURN=2
+ }
+ done
+
+ # Check if _service is sane
+ if [ -f $DIR_TO_CHECK/_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
fi
+
#
# now check if everything is marked in spec files.
#
@@ -338,31 +353,35 @@
debian.*.prerm )
;;
*)
- grep -a -x $BASE $TMPDIR/sources > /dev/null && continue
+ grep -a -x $BASE $TMPDIR/sources > /dev/null && continue
+ test -f $DIR_TO_CHECK/_service && egrep -q 'mode=.remoterun'
$DIR_TO_CHECK/_service && continue
+ # be a bit more relaxed for osc, it won't upload directories anyway
+ [ -d $DIR_TO_CHECK/$BASE ] && [ -d $DIR_TO_CHECK/.osc ] &&
continue
+
echo "(W) Attention, $BASE is not mentioned in spec files as source
or patch."
- if test "$RETURN" != "2" ; then
- if [ -d $DIR_TO_CHECK/$BASE ] ; then
- # be a bit more relaxed for osc, it won't upload directories
anyway
- if [ ! -d $DIR_TO_CHECK/.osc ] ; then
- echo "!! $BASE is a directory !!"
- if test "$BATCHMODE" != true ; then
- echo " remove subtree with 'r'"
- echo "ignore and continue with 'y'"
- echo -n "Is this correct? [N/y/r] "
- read ANSWER
- test "$ANSWER" = y -o "$ANSWER" = Y || {
- # r for remove is also accepted, to make it compatible
with osc itself
- if test "$ANSWER" = d -o "$ANSWER" = D -o "$ANSWER" = r
-o "$ANSWER" = R; then
- rm -Rfv $DIR_TO_CHECK/$BASE
- else
- echo ok, please fix it...
- test "$RETURN" != "2" && RETURN=1
- fi
- }
- else
- echo "###ASK -r $DIR_TO_CHECK/$BASE"
- fi
- fi
+ if test "$RETURN" != "2" ; then
+ if [ -d $DIR_TO_CHECK/$BASE ] ; then
+ # be a bit more relaxed for osc, it won't upload
directories anyway
+ if [ ! -d $DIR_TO_CHECK/.osc ] ; then
+ echo "!! $BASE is a directory !!"
+ if test "$BATCHMODE" != true ; then
+ echo " remove subtree with 'r'"
+ echo "ignore and continue with 'y'"
+ echo -n "Is this correct? [N/y/r] "
+ read ANSWER
+ test "$ANSWER" = y -o "$ANSWER" = Y || {
+ # r for remove is also accepted, to make it
compatible with osc itself
+ if test "$ANSWER" = d -o "$ANSWER" = D -o
"$ANSWER" = r -o "$ANSWER" = R; then
+ rm -Rfv $DIR_TO_CHECK/$BASE
+ else
+ echo ok, please fix it...
+ test "$RETURN" != "2" && RETURN=1
+ fi
+ }
+ else
+ echo "###ASK -r $DIR_TO_CHECK/$BASE"
+ fi
+ fi
else
if test "$BATCHMODE" != true ; then
echo -n "Is this correct? [N/y/d] (y to ignore) "
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
