Hello community,
here is the log from the commit of package osc-source_validator for
openSUSE:Factory
checked in at Thu Jul 21 10:00:45 CEST 2011.
--------
--- osc-source_validator/osc-source_validator.changes 2011-07-01
17:12:49.000000000 +0200
+++
/mounts/work_src_done/STABLE/osc-source_validator/osc-source_validator.changes
2011-07-20 12:04:56.000000000 +0200
@@ -1,0 +2,10 @@
+Wed Jul 20 12:04:12 CEST 2011 - [email protected]
+
+- helpers/check_patches_applied:
+ rework regex for commented out patch lines
+- 20-files-present-and-referenced:
+ update from dirk: fix for batch case
+- prefix error output lines by (E) where missing
+- drop get_sources.sh script, sources live in GIT
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
get_source.sh
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ osc-source_validator.spec ++++++
--- /var/tmp/diff_new_pack.4CqxTP/_old 2011-07-21 09:49:13.000000000 +0200
+++ /var/tmp/diff_new_pack.4CqxTP/_new 2011-07-21 09:49:13.000000000 +0200
@@ -19,13 +19,12 @@
Name: osc-source_validator
Version: 0.1
-Release: 18
+Release: 20
License: GPLv2+
Summary: osc source validator
Url:
http://en.opensuse.org/openSUSE:Build_Service_Tools#OSC_source_validator
Group: Development/Tools/Building
Source: %{name}-%{version}.tar.bz2
-Source1: get_source.sh
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
++++++ osc-source_validator-0.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/osc-source_validator-0.1/20-files-present-and-referenced
new/osc-source_validator-0.1/20-files-present-and-referenced
--- old/osc-source_validator-0.1/20-files-present-and-referenced
2011-07-01 17:11:25.000000000 +0200
+++ new/osc-source_validator-0.1/20-files-present-and-referenced
2011-07-20 12:03:10.000000000 +0200
@@ -150,7 +150,7 @@
local file=${1##*/}
if ! test -f "$DIR_TO_CHECK/$file"; then
- echo "$file mentioned in spec file does not exist."
+ echo "(E) $file mentioned in spec file does not exist."
return 1
fi
if test "$OSC_MODE" = "true" ; then
@@ -160,7 +160,7 @@
if grep -qsFx "$file" "$DESTINATIONDIR/_to_be_added"; then
return 0
fi
- echo "$file mentioned in spec file is not tracked."
+ echo "(E) $file mentioned in spec file is not tracked."
return 1
fi
}
@@ -237,10 +237,10 @@
echo "###ASK $DIR_TO_CHECK/$BASE"
fi
fi
- ILLEGAL_RPMLINTRC="setuid-bit permissions-unauthorized-file
permissions-world-writable"
- for ignorecheck in $ILLEGAL_RPMLINTRC ; do
- LINE=$(grep -i $ignorecheck "$DIR_TO_CHECK/$BASE")
- if [ "$LINE" != "" ]; then
+
+ LINE=$(egrep -w setBadness "$DIR_TO_CHECK/$BASE")
+ if [ "$LINE" != "" ]; then
+ if test "$BATCHMODE" != true ; then
echo "ERROR: Found possibly illegal rpmlintrc line:"
echo " $LINE"
echo -n "Is this correct? [N/y] (y to ignore) "
@@ -249,8 +249,10 @@
echo ok, please fix it...
RETURN=1
}
+ else
+ echo "###ASK $DIR_TO_CHECK/$BASE"
fi
- done
+ fi
;;
.*.spec)
rm -v $DIR_TO_CHECK/$BASE
@@ -306,7 +308,7 @@
;;
*)
grep -a -x $BASE $TMPDIR/sources > /dev/null && continue
- echo Attention, $BASE is not mentioned in spec files as source or
patch.
+ echo "(W) Attention, $BASE is not mentioned in spec files as source
or patch."
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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osc-source_validator-0.1/60-spec-filelist
new/osc-source_validator-0.1/60-spec-filelist
--- old/osc-source_validator-0.1/60-spec-filelist 2011-07-01
17:11:25.000000000 +0200
+++ new/osc-source_validator-0.1/60-spec-filelist 2011-07-20
12:03:10.000000000 +0200
@@ -30,7 +30,7 @@
case $LINE in
*/usr/man/*|*/usr/info/*|*/usr/include/X11/*|*/usr/bin/X11/*)
RETURN=1
- echo `basename $SPECFILE` uses forbidden file path
\"$LINE\".
+ echo "(E)" `basename $SPECFILE` uses forbidden file
path \"$LINE\".
;;
esac
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/osc-source_validator-0.1/helpers/check_dates_in_changes
new/osc-source_validator-0.1/helpers/check_dates_in_changes
--- old/osc-source_validator-0.1/helpers/check_dates_in_changes 2011-07-01
17:11:25.000000000 +0200
+++ new/osc-source_validator-0.1/helpers/check_dates_in_changes 2011-07-20
12:03:10.000000000 +0200
@@ -49,14 +49,14 @@
break
;;
*)
- echo "$DATESTR is no date"
+ echo "(E) $DATESTR is no date"
TROUBLE_FOUND=true
;;
esac
DATE=`date +%s --date "$DATESTR" 2> /dev/null`
test $? -gt 0 -o -z "$DATE" -o "$LAST_IS_YEAR" != true && {
echo $CHANGES
- echo " INVALID \"$DATESTR\" "
+ echo "(E) INVALID \"$DATESTR\" "
TROUBLE_FOUND=true
}
;;
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-07-01
17:11:25.000000000 +0200
+++ new/osc-source_validator-0.1/helpers/check_patches_applied 2011-07-20
12:03:10.000000000 +0200
@@ -42,7 +42,7 @@
$PATCHES_COMMENTED[$front] = 1 if $commented;
next;
}
- if (/^(#.*)?%[Pp]atch/ || /^#[Pp]atch/) {
+ if (/^([#\s]*)?%[Pp]atch/ || /^#[Pp]atch/) {
my $applied = (/^#/) ? 2 :1;
my @line = split (/\s+/,$_);
my $had_P = grep {/^-P/} @line;
@@ -66,13 +66,13 @@
print STDERR "line was $_\n" if $debug;
$errors++;
}
- } elsif ($arg =~ /^(#.*)?%[Pp]atch$/) {
+ } elsif ($arg =~ /^([#\s]*)?%[Pp]atch$/) {
unless ($had_P) {
$arg = 0;
$APPLIED[$arg] = $applied unless $APPLIED[$arg];
}
- } elsif ($arg =~ /^(#.*)?%?patch[^-]/ || $arg =~
/^(#.*)?%?Patch[^-].*:.*/) {
- $arg =~ s/^(#.*)?%?[Pp]atch//;
+ } elsif ($arg =~ /^([#\s]*)?%?patch[^-]/ || $arg =~
/^([#\s]*)?%?Patch[^-].*:.*/) {
+ $arg =~ s/^([#\s]*)?%?[Pp]atch//;
if ($arg =~ /^[0-9]/) {
$APPLIED[$arg] = $applied unless $APPLIED[$arg];
} else {
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
