commit osc-source_validator for openSUSE:Factory
Hello community,
here is the log from the commit of package osc-source_validator for
openSUSE:Factory checked in at 2012-02-22 15:54:03
Comparing /work/SRC/openSUSE:Factory/osc-source_validator (Old)
and /work/SRC/openSUSE:Factory/.osc-source_validator.new (New)
Package is "osc-source_validator", Maintainer is ""
Changes:
---
/work/SRC/openSUSE:Factory/osc-source_validator/osc-source_validator.changes
2012-02-21 12:22:29.0 +0100
+++
/work/SRC/openSUSE:Factory/.osc-source_validator.new/osc-source_validator.changes
2012-02-22 15:54:06.0 +0100
@@ -1,0 +2,6 @@
+Wed Feb 22 10:50:13 CET 2012 - r...@suse.de
+
+- use old pathes again in osc-source-validator,
+ not the service ones
+
+---
New:
revert-old.diff
Other differences:
--
++ osc-source_validator.spec ++
--- /var/tmp/diff_new_pack.epGCjB/_old 2012-02-22 15:54:07.0 +0100
+++ /var/tmp/diff_new_pack.epGCjB/_new 2012-02-22 15:54:07.0 +0100
@@ -23,6 +23,7 @@
Group: Development/Tools/Building
Url:
http://en.opensuse.org/openSUSE:Build_Service_Tools#OSC_source_validator
Source: %{name}-%{version}.tar.bz2
+Patch: revert-old.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
Requires: perl-TimeDate
@@ -32,6 +33,7 @@
%prep
%setup -q -n %{name}-%{version}
+%patch -p1 -R
%build
++ revert-old.diff ++
commit 8a76e71cf7bd2cfe8ab7592adf9d02ce3ddcbe4b
Author: Adrian Schröter
Date: Fri Sep 23 10:27:23 2011 +0200
- change pathes to use obs-service path instead of osc one
diff --git a/30-patches-applied b/30-patches-applied
index 058b169..e3546f4 100755
--- a/30-patches-applied
+++ b/30-patches-applied
@@ -15,7 +15,7 @@ for i in $DIR_TO_CHECK/*.spec ; do
test "$VERBOSE" = true && echo -n "."
RETURN=0
# WARNING only at the moment, just complain loudly ...
-/usr/lib/osc/source_validators/helpers/check_patches_applied $BATCHMODE $i
|| RETURN=1
+/usr/lib/obs/service/source_validators/helpers/check_patches_applied
$BATCHMODE $i || RETURN=1
done
test "$VERBOSE" = true && echo "done"
diff --git a/40-sequence-changes b/40-sequence-changes
index e065b72..4b46071 100755
--- a/40-sequence-changes
+++ b/40-sequence-changes
@@ -19,12 +19,12 @@ for i in $DIR_TO_CHECK/*.changes ; do
continue
fi
fi
-/usr/lib/osc/source_validators/helpers/check_dates_in_changes $i || {
- echo "Please fix with your own tools or try
/usr/lib/osc/source_validators/helpers/fix_changelog" >&2;
+/usr/lib/obs/service/source_validators/helpers/check_dates_in_changes $i
|| {
+ echo "Please fix with your own tools or try
/usr/lib/obs/service/source_validators/helpers/fix_changelog" >&2;
RETURN=1
}
-/usr/lib/osc/source_validators/helpers/convert_changes_to_rpm_changelog
--check < $i > /dev/null || {
- echo "Please fix with your own tools or try
/usr/lib/osc/source_validators/helpers/fix_changelog" >&2;
+
/usr/lib/obs/service/source_validators/helpers/convert_changes_to_rpm_changelog
--check < $i > /dev/null || {
+ echo "Please fix with your own tools or try
/usr/lib/obs/service/source_validators/helpers/fix_changelog" >&2;
RETURN=1
}
diff --git a/45-stale-changes b/45-stale-changes
index 12c2c40..2664b26 100755
--- a/45-stale-changes
+++ b/45-stale-changes
@@ -9,7 +9,7 @@ test -z "$DESTINATIONDIR" -a -d "$DIR_TO_CHECK/.osc" &&
DESTINATIONDIR="$DIR_TO_
RETURN=0
test "$VERBOSE" = true && echo -n "- checking for stale or missing changes "
-SPECLIST=`/usr/lib/osc/source_validators/helpers/output_versions -q -m
$DIR_TO_CHECK | sed -e "s@ .*@@" | sort -u`
+SPECLIST=`/usr/lib/obs/service/source_validators/helpers/output_versions -q -m
$DIR_TO_CHECK | sed -e "s@ .*@@" | sort -u`
test -n "$SPECLIST" && {
for i in $SPECLIST ; do
diff --git a/get_source.sh b/get_source.sh
index d8e75a4..6f17163 100644
--- a/get_source.sh
+++ b/get_source.sh
@@ -1,25 +1,25 @@
#!/bin/bash
-rm -rf osc-source_validator
-mkdir osc-source_validator
+rm -rf obs-service-source_validator
+mkdir obs-service-source_validator
for i in /work/cd/lib/source_validators/* ; do
test -f $i || continue
case $i in *abuild*) continue ;; esac
- sed -e "s@/work/cd/lib@/usr/lib/osc@" $i > osc-source_validator/`basename
$i`
- chmod 755 osc-source_validator/`basename $i`
+ sed -e "s@/work/cd/lib@/usr/lib/obs/service" $i >
obs-service-source_validator/`basename $i`
+ chmod 755 obs-service-source_validator/`basename $i`
done
-mkdir osc-source_validator/helpers
+mkdir obs-service-source_validator/helpers
for i in /work/cd/lib/sourc
commit osc-source_validator for openSUSE:Factory
Hello community,
here is the log from the commit of package osc-source_validator for
openSUSE:Factory checked in at 2012-02-16 10:06:32
Comparing /work/SRC/openSUSE:Factory/osc-source_validator (Old)
and /work/SRC/openSUSE:Factory/.osc-source_validator.new (New)
Package is "osc-source_validator", Maintainer is ""
Changes:
---
/work/SRC/openSUSE:Factory/osc-source_validator/osc-source_validator.changes
2011-09-23 12:21:08.0 +0200
+++
/work/SRC/openSUSE:Factory/.osc-source_validator.new/osc-source_validator.changes
2012-02-16 10:06:34.0 +0100
@@ -1,0 +2,10 @@
+Mon Feb 13 10:51:29 UTC 2012 - co...@suse.com
+
+- patch license to follow spdx.org standard
+
+---
+Fri Nov 18 13:33:09 UTC 2011 - jreidin...@suse.com
+
+- add missing requirement for perl-TimeDate for changelog checker
+
+---
Other differences:
--
++ osc-source_validator.spec ++
--- /var/tmp/diff_new_pack.ZqgQnA/_old 2012-02-16 10:06:35.0 +0100
+++ /var/tmp/diff_new_pack.ZqgQnA/_new 2012-02-16 10:06:35.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package osc-source_validator
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,17 +16,17 @@
#
-
Name: osc-source_validator
Version:0.1
-Release:28
-License:GPLv2+
+Release:0
Summary:osc source validator
-Url:
http://en.opensuse.org/openSUSE:Build_Service_Tools#OSC_source_validator
+License:GPL-2.0+
Group: Development/Tools/Building
+Url:
http://en.opensuse.org/openSUSE:Build_Service_Tools#OSC_source_validator
Source: %{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
+Requires: perl-TimeDate
%description
osc is checking valid sources on pre-checkin via this package
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit osc-source_validator for openSUSE:Factory
Hello community,
here is the log from the commit of package osc-source_validator for
openSUSE:Factory
checked in at Thu Sep 22 13:56:07 CEST 2011.
--- osc-source_validator/osc-source_validator.changes 2011-09-02
10:37:50.0 +0200
+++
/mounts/work_src_done/STABLE/osc-source_validator/osc-source_validator.changes
2011-09-22 12:05:21.0 +0200
@@ -1,0 +2,10 @@
+Thu Sep 22 12:05:05 CEST 2011 - r...@suse.de
+
+- one step back: keep subshell macros starting with echo
+
+---
+Wed Sep 21 12:40:51 CEST 2011 - r...@suse.de
+
+- kill subshell macros in 20-files-present-and-referenced
+
+---
calling whatdependson for head-i586
Other differences:
--
++ 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-09-02 10:37:01.0 +0200
+++ new/osc-source_validator-0.1/20-files-present-and-referenced
2011-09-22 12:04:12.0 +0200
@@ -43,6 +43,10 @@
sed '/^#%([^)]*$/,/^[^(]*)/d
/^#[^%]/d
/^#%(.*)/d
+ /^%.*%(echo.*)/{;p;d;}
+ /^%.*%([^)]*)/{
+ s@%([^)]*)@1@
+ }
/^%define/{
s@%(rpm -q.*)@1@
}
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit osc-source_validator for openSUSE:Factory
Hello community,
here is the log from the commit of package osc-source_validator for
openSUSE:Factory
checked in at Fri Sep 2 13:09:11 CEST 2011.
--- osc-source_validator/osc-source_validator.changes 2011-08-30
19:07:46.0 +0200
+++
/mounts/work_src_done/STABLE/osc-source_validator/osc-source_validator.changes
2011-09-02 10:37:50.0 +0200
@@ -1,0 +2,5 @@
+Fri Sep 2 10:37:39 CEST 2011 - r...@suse.de
+
+- live with [a-z]*_requires
+
+---
calling whatdependson for head-i586
Other differences:
--
++ osc-source_validator.spec ++
--- /var/tmp/diff_new_pack.LicsDz/_old 2011-09-02 13:08:41.0 +0200
+++ /var/tmp/diff_new_pack.LicsDz/_new 2011-09-02 13:08:41.0 +0200
@@ -19,7 +19,7 @@
Name: osc-source_validator
Version:0.1
-Release:26
+Release:28
License:GPLv2+
Summary:osc source validator
Url:
http://en.opensuse.org/openSUSE:Build_Service_Tools#OSC_source_validator
++ 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-08-30 19:07:00.0 +0200
+++ new/osc-source_validator-0.1/20-files-present-and-referenced
2011-09-02 10:37:01.0 +0200
@@ -51,7 +51,8 @@
/^%global.*%(.*)/d
/^%global/{;p;d;}
/^%include/d
- /^%rubygems_requires/d
+ /^%[a-z]*_requires/d
+ /^%{[a-z]*_requires}/d
/^%gconf_schemas_prereq/d
/^%requires_eq/{;p;d;}
/^%requires_ge/{;p;d;}
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit osc-source_validator for openSUSE:Factory
Hello community,
here is the log from the commit of package osc-source_validator for
openSUSE:Factory
checked in at Wed Aug 31 10:25:24 CEST 2011.
--- osc-source_validator/osc-source_validator.changes 2011-08-19
15:10:10.0 +0200
+++
/mounts/work_src_done/STABLE/osc-source_validator/osc-source_validator.changes
2011-08-30 19:07:46.0 +0200
@@ -1,0 +2,11 @@
+Tue Aug 30 19:07:36 CEST 2011 - r...@suse.de
+
+- fix last change
+
+---
+Tue Aug 30 14:29:29 UTC 2011 - r...@suse.com
+
+- 20-files-present-and-referenced check return code from rpmbuild,
+ not the one from egrep
+
+---
calling whatdependson for head-i586
Other differences:
--
++ osc-source_validator.spec ++
--- /var/tmp/diff_new_pack.XsdH4v/_old 2011-08-31 10:25:06.0 +0200
+++ /var/tmp/diff_new_pack.XsdH4v/_new 2011-08-31 10:25:06.0 +0200
@@ -19,7 +19,7 @@
Name: osc-source_validator
Version:0.1
-Release:24
+Release:26
License:GPLv2+
Summary:osc source validator
Url:
http://en.opensuse.org/openSUSE:Build_Service_Tools#OSC_source_validator
++ 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-08-17 16:11:54.0 +0200
+++ new/osc-source_validator-0.1/20-files-present-and-referenced
2011-08-30 19:07:00.0 +0200
@@ -120,10 +120,11 @@
sed -e "s@^$nodup:@X$nodup:@" -e
"0,/^X$nodup:/{s@^X$nodup:@$nodup:@}" -e "s@^X$nodup:.*@@" $TMPDIR/tmp.spec >
$TMPDIR/tmp.spec.2 && mv $TMPDIR/tmp.spec.2 $TMPDIR/tmp.spec
done
- $RPMBUILD -bp $TMPDIR/tmp.spec 2>&1 >/dev/null | egrep -v '^warning:'
>>$TMPDIR/sources || {
+ $RPMBUILD -bp $TMPDIR/tmp.spec >> $TMPDIR/sources 2>&1 || {
$RPMBUILD -bp $TMPDIR/tmp.spec
cleanup_and_exit 1
}
+ egrep -v '^warning' $TMPDIR/sources > $TMPDIR/sources.t && mv
$TMPDIR/sources.t $TMPDIR/sources
done
test -f $TMPDIR/sources || cleanup_and_exit
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit osc-source_validator for openSUSE:Factory
Hello community,
here is the log from the commit of package osc-source_validator for
openSUSE:Factory
checked in at Mon Aug 22 10:53:31 CEST 2011.
--- osc-source_validator/osc-source_validator.changes 2011-08-11
16:57:13.0 +0200
+++
/mounts/work_src_done/STABLE/osc-source_validator/osc-source_validator.changes
2011-08-19 15:10:10.0 +0200
@@ -1,0 +2,7 @@
+Fri Aug 19 15:09:27 CEST 2011 - r...@suse.de
+
+- Handle properly situations where variables or conditionis are used
+ with syntax like "%if 0%{?some_var}" or just "%{?some_var}"
+ (thanks to "kad" for this fix)
+
+---
calling whatdependson for head-i586
Other differences:
--
++ osc-source_validator.spec ++
--- /var/tmp/diff_new_pack.mCoOTw/_old 2011-08-22 10:43:00.0 +0200
+++ /var/tmp/diff_new_pack.mCoOTw/_new 2011-08-22 10:43:00.0 +0200
@@ -19,7 +19,7 @@
Name: osc-source_validator
Version:0.1
-Release:22
+Release:24
License:GPLv2+
Summary:osc source validator
Url:
http://en.opensuse.org/openSUSE:Build_Service_Tools#OSC_source_validator
++ osc-source_validator-0.1.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osc-source_validator-0.1/helpers/output_versions
new/osc-source_validator-0.1/helpers/output_versions
--- old/osc-source_validator-0.1/helpers/output_versions2011-08-11
16:55:14.0 +0200
+++ new/osc-source_validator-0.1/helpers/output_versions2011-08-17
16:11:54.0 +0200
@@ -78,7 +78,8 @@
if ( /^\s*%if/ || /^\s*%\{/ || /^\s*%define/ || /^\s*%el/ ||
/^\s*%endif/ ) {
if ( /^\s*%if\s/ ) {
my @args = split (/\s+/,$_);
- $_ =~ s/[\{\}\"]//g for (@args);
+ $_ =~ s/[\?\{\}\"]//g for (@args);
+ $_ =~ s/^0%/%/ for (@args);
$ifhandler->{"last_if_disabled"} = 0;
$ifhandler->{"last_if_if"} = 1;
$ifhandler->{"depth"}++;
@@ -115,7 +116,7 @@
}
} elsif ( /^\s*%define\s/ ) {
my @args = split (/\s+/,$_);
- $_ =~ s/[\{\}\"]//g for (@args);
+ $_ =~ s/[\?\{\}\"]//g for (@args);
$args[2] =~ s/\Q$_\E/$definelist->{$_}/g for (sort { length($b)
<=> length($a) } keys (%{$definelist}));
if ( $args[2] !~ /[\(\)\{\}\@\%\"\\]/ ) {
$definelist->{"%".$args[1]} = $args[2] if
$ifhandler->{"disabled"} == 0;
@@ -130,7 +131,7 @@
next unless $ifhandler->{"disabled"} == 0;
next if $main_package_name;
my @args = split (/\s+/,$_);
- $_ =~ s/[\{\}\"]//g for (@args);
+ $_ =~ s/[\?\{\}\"]//g for (@args);
$args[1] =~ s/\Q$_\E/$definelist->{$_}/ for (sort { length($b)
<=> length($a) } keys (%{$definelist}));
$current_package = $args[1];
$package_name = $current_package;
@@ -162,7 +163,7 @@
}
$package_version = "";
my @args = split (/\s+/,$_);
- $_ =~ s/[\{\}\"]//g for (@args);
+ $_ =~ s/[\?\{\}\"]//g for (@args);
if ($args[1] =~ /^-n/) {
#warn "trying on ".join(",",(keys
(%{$definelist})))."\n" if $debug;
$args[2] =~ s/\Q$_\E/$definelist->{$_}/ for (sort {
length($b) <=> length($a) } keys (%{$definelist}));
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit osc-source_validator for openSUSE:Factory
Hello community,
here is the log from the commit of package osc-source_validator for
openSUSE:Factory
checked in at Fri Aug 12 11:39:47 CEST 2011.
--- osc-source_validator/osc-source_validator.changes 2011-07-20
12:04:56.0 +0200
+++
/mounts/work_src_done/STABLE/osc-source_validator/osc-source_validator.changes
2011-08-11 16:57:13.0 +0200
@@ -1,0 +2,7 @@
+Thu Aug 11 14:56:35 UTC 2011 - r...@suse.com
+
+- 20-files-present-and-referenced:
+ ignore "warning: waiting for shared lock"
+ do not overwrite RETURN=2 (error) when setting RETURN=1 (warning)
+
+---
calling whatdependson for head-i586
Other differences:
--
++ osc-source_validator.spec ++
--- /var/tmp/diff_new_pack.vYUKjt/_old 2011-08-12 11:39:14.0 +0200
+++ /var/tmp/diff_new_pack.vYUKjt/_new 2011-08-12 11:39:14.0 +0200
@@ -19,7 +19,7 @@
Name: osc-source_validator
Version:0.1
-Release:20
+Release:22
License:GPLv2+
Summary:osc source validator
Url:
http://en.opensuse.org/openSUSE:Build_Service_Tools#OSC_source_validator
++ 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-20 12:03:10.0 +0200
+++ new/osc-source_validator-0.1/20-files-present-and-referenced
2011-08-11 16:55:14.0 +0200
@@ -120,7 +120,7 @@
sed -e "s@^$nodup:@X$nodup:@" -e
"0,/^X$nodup:/{s@^X$nodup:@$nodup:@}" -e "s@^X$nodup:.*@@" $TMPDIR/tmp.spec >
$TMPDIR/tmp.spec.2 && mv $TMPDIR/tmp.spec.2 $TMPDIR/tmp.spec
done
- $RPMBUILD -bp $TMPDIR/tmp.spec 2>>$TMPDIR/sources || {
+ $RPMBUILD -bp $TMPDIR/tmp.spec 2>&1 >/dev/null | egrep -v '^warning:'
>>$TMPDIR/sources || {
$RPMBUILD -bp $TMPDIR/tmp.spec
cleanup_and_exit 1
}
@@ -166,7 +166,7 @@
}
for HASTOBETHER in `cat $TMPDIR/sources` ; do
-check_tracked "$HASTOBETHER" || RETURN=1
+check_tracked "$HASTOBETHER" || RETURN=2
done
#
@@ -206,7 +206,7 @@
rm -v $DIR_TO_CHECK/$BASE
else
echo ok, please fix it...
- RETURN=1
+ test "$RETURN" != "2" && RETURN=1
fi
}
else
@@ -230,7 +230,7 @@
rm -v $DIR_TO_CHECK/$BASE
else
echo ok, please fix it...
- RETURN=1
+ test "$RETURN" != "2" && RETURN=1
fi
}
else
@@ -247,7 +247,7 @@
read ANSWER
test "$ANSWER" = y -o "$ANSWER" = Y || {
echo ok, please fix it...
- RETURN=1
+ test "$RETURN" != "2" && RETURN=1
}
else
echo "###ASK $DIR_TO_CHECK/$BASE"
@@ -309,7 +309,8 @@
*)
grep -a -x $BASE $TMPDIR/sources > /dev/null && continue
echo "(W) Attention, $BASE is not mentioned in spec files as source
or patch."
- if [ -d $DIR_TO_CHECK/$BASE ] ; then
+ 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 !!"
@@ -324,14 +325,14 @@
rm -Rfv $DIR_TO_CHECK/$BASE
else
echo ok, please fix it...
- RETURN=1
+ test "$RETURN" != "2" && RETURN=1
fi
}
else
echo "###ASK -r $DIR_TO_CHECK/$BASE"
fi
fi
- else
+ else
if test "$BATCHMODE" != true ; then
echo -n "Is this correct? [N/y/d] (y to ignore) "
read ANSWER
@@ -340,12 +341,13 @@
rm -v $DIR_TO_CHECK/$BASE
else
echo ok, please fix it...
- RETURN=1
+ test "$RETURN" != "2" && RETURN=1
fi
}
else
echo "###ASK $DIR_TO_CHECK/$BASE"
fi
+ fi
commit osc-source_validator for openSUSE:Factory
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.0 +0200
+++
/mounts/work_src_done/STABLE/osc-source_validator/osc-source_validator.changes
2011-07-20 12:04:56.0 +0200
@@ -1,0 +2,10 @@
+Wed Jul 20 12:04:12 CEST 2011 - r...@suse.de
+
+- 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.0 +0200
+++ /var/tmp/diff_new_pack.4CqxTP/_new 2011-07-21 09:49:13.0 +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.0 +0200
+++ new/osc-source_validator-0.1/20-files-present-and-referenced
2011-07-20 12:03:10.0 +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.0 +0200
+++ new/osc-source_validator-0.1/60-spec-filelist 2011-07-20
12:03:10.0 +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\".
commit osc-source_validator for openSUSE:Factory
Hello community,
here is the log from the commit of package osc-source_validator for
openSUSE:Factory
checked in at Mon Jul 11 15:47:53 CEST 2011.
--- osc-source_validator/osc-source_validator.changes 2011-05-09
15:47:38.0 +0200
+++
/mounts/work_src_done/STABLE/osc-source_validator/osc-source_validator.changes
2011-07-01 17:12:49.0 +0200
@@ -1,0 +2,10 @@
+Fri Jul 1 17:12:32 CEST 2011 - r...@suse.de
+
+- prevent dupes for Release and Version along with Name
+
+---
+Mon May 30 11:53:53 CEST 2011 - r...@suse.de
+
+- fix bug with "Patch" in comments
+
+---
calling whatdependson for head-i586
Other differences:
--
++ osc-source_validator.spec ++
--- /var/tmp/diff_new_pack.XIdxRt/_old 2011-07-11 15:46:47.0 +0200
+++ /var/tmp/diff_new_pack.XIdxRt/_new 2011-07-11 15:46:47.0 +0200
@@ -19,7 +19,7 @@
Name: osc-source_validator
Version:0.1
-Release:16
+Release:18
License:GPLv2+
Summary:osc source validator
Url:
http://en.opensuse.org/openSUSE:Build_Service_Tools#OSC_source_validator
++ 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-05-09 15:45:41.0 +0200
+++ new/osc-source_validator-0.1/20-files-present-and-referenced
2011-07-01 17:11:25.0 +0200
@@ -115,8 +115,10 @@
done < <(grep -E "^Source:|^Source[0-9]*:|^Patch:|^Patch[0-9]*:" $i)
echo "%description" >> $TMPDIR/tmp.spec
- # hack for really strange specfiles with more than one Name: line
- sed -e "s@^Name:@XName:@" -e "0,/^XName:/{s@^XName:@Name:@}" -e
"s@^XName:.*@@" $TMPDIR/tmp.spec > $TMPDIR/tmp.spec.2 && mv $TMPDIR/tmp.spec.2
$TMPDIR/tmp.spec
+# hack for really strange specfiles with more than one
Name:/Release:/Version: line
+for nodup in Name Version Release ; do
+sed -e "s@^$nodup:@X$nodup:@" -e
"0,/^X$nodup:/{s@^X$nodup:@$nodup:@}" -e "s@^X$nodup:.*@@" $TMPDIR/tmp.spec >
$TMPDIR/tmp.spec.2 && mv $TMPDIR/tmp.spec.2 $TMPDIR/tmp.spec
+done
$RPMBUILD -bp $TMPDIR/tmp.spec 2>>$TMPDIR/sources || {
$RPMBUILD -bp $TMPDIR/tmp.spec
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-05-09
15:45:41.0 +0200
+++ new/osc-source_validator-0.1/helpers/check_patches_applied 2011-07-01
17:11:25.0 +0200
@@ -1,10 +1,15 @@
#!/usr/bin/perl -w
my $batchmode = 0;
+my $debug = 0;
if ($ARGV[0] eq "--batchmode") {
$batchmode = 1;
shift;
}
+if ($ARGV[0] eq "--debug") {
+ $debug = 1;
+ shift;
+}
my $filename = $ARGV[0];
$filename =~ s/^.*\///g;
@@ -49,6 +54,7 @@
$APPLIED[$arg] = $applied;
} else {
print STDERR "$col_red(E) %patch -P without
following numeric argument$col_norm\n";
+ print STDERR "line was $_\n" if $debug;
$errors++;
}
} elsif ($arg =~ /^-P/) {
@@ -57,6 +63,7 @@
$APPLIED[$arg] = $applied unless $APPLIED[$arg];
} else {
print STDERR "$col_red(E) %patch -P without
following numeric argument$col_norm\n";
+ print STDERR "line was $_\n" if $debug;
$errors++;
}
} elsif ($arg =~ /^(#.*)?%[Pp]atch$/) {
@@ -64,12 +71,13 @@
$arg = 0;
$APPLIED[$arg] = $applied unless $APPLIED[$arg];
}
- } elsif ($arg =~ /^(#.*)?%?[Pp]atch/) {
+ } elsif ($arg =~ /^(#.*)?%?patch[^-]/ || $arg =~
/^(#.*)?%?Patch[^-].*:.*/) {
$arg =~ s/^(#.*)?%?[Pp]atch//;
if ($arg =~ /^[0-9]/) {
$APPLIED[$arg] = $applied unless $APPLIED[$arg];
} else {
print STDERR "$col_red(E) %patchZZZ without
following numeric argument$col_norm\n";
+ print STDERR "line was $_\n" if $debug;
$errors++;
}
commit osc-source_validator for openSUSE:Factory
Hello community,
here is the log from the commit of package osc-source_validator for
openSUSE:Factory
checked in at Tue May 10 09:14:30 CEST 2011.
--- osc-source_validator/osc-source_validator.changes 2011-04-18
01:07:34.0 +0200
+++
/mounts/work_src_done/STABLE/osc-source_validator/osc-source_validator.changes
2011-05-09 15:47:38.0 +0200
@@ -1,0 +2,11 @@
+Mon May 9 13:47:29 UTC 2011 - r...@novell.com
+
+- try to fix bnc#679980
+
+---
+Wed Apr 20 17:30:19 CEST 2011 - r...@suse.de
+
+- find another form of commenting out patches
+ in check_patches_applied
+
+---
calling whatdependson for head-i586
Other differences:
--
++ osc-source_validator.spec ++
--- /var/tmp/diff_new_pack.o6DrKj/_old 2011-05-10 09:13:53.0 +0200
+++ /var/tmp/diff_new_pack.o6DrKj/_new 2011-05-10 09:13:53.0 +0200
@@ -19,7 +19,7 @@
Name: osc-source_validator
Version:0.1
-Release:14
+Release:16
License:GPLv2+
Summary:osc source validator
Url:
http://en.opensuse.org/openSUSE:Build_Service_Tools#OSC_source_validator
++ 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-04-18 01:02:49.0 +0200
+++ new/osc-source_validator-0.1/20-files-present-and-referenced
2011-05-09 15:45:41.0 +0200
@@ -96,9 +96,10 @@
/^Supplements/d
/^Suggests/d
/^Enhances/d
- s/^\([Ss]ource\|[Pp]atch\)[0-9]*:[ ]*/%{echo:/
- s/^Release:.*/Release: 0/
- /^%{echo:/s/$/ }/' $i >$TMPDIR/tmp.spec
+ /^\([Ss]ource\|[Pp]atch\)[0-9]*:[ ]*/{
+ s/^\(\([Ss]ource\|[Pp]atch\)[0-9]*:[
]*\)\(.*\)/##seen \1\3\n%{echo:\3 }/
+ }
+ s/^Release:.*/Release: 0/' $i >$TMPDIR/tmp.spec
grep -a ^Icon: $i|sed -n 's/^Icon:[ ]*/%{echo:/
/^%{echo:/s/$/ }/p' >>$TMPDIR/tmp.spec
grep -a -q ^Release $i || {
@@ -109,6 +110,9 @@
-gt `grep -a "^%endif" $TMPDIR/tmp.spec | wc -l` ; do
echo "%endif" >> $TMPDIR/tmp.spec
done
+ while read line ; do
+ grep -qx "##seen $line" $TMPDIR/tmp.spec || echo "$line" | sed -e
"s/^\(\([Ss]ource\|[Pp]atch\)[0-9]*:[]*\)\(.*\)/##seen \1\3\n%{echo:\3 }/"
>> $TMPDIR/tmp.spec
+ done < <(grep -E "^Source:|^Source[0-9]*:|^Patch:|^Patch[0-9]*:" $i)
echo "%description" >> $TMPDIR/tmp.spec
# hack for really strange specfiles with more than one Name: line
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-04-18
01:02:49.0 +0200
+++ new/osc-source_validator-0.1/helpers/check_patches_applied 2011-05-09
15:45:41.0 +0200
@@ -37,7 +37,7 @@
$PATCHES_COMMENTED[$front] = 1 if $commented;
next;
}
- if (/^(#.*)?%[Pp]atch/) {
+ if (/^(#.*)?%[Pp]atch/ || /^#[Pp]atch/) {
my $applied = (/^#/) ? 2 :1;
my @line = split (/\s+/,$_);
my $had_P = grep {/^-P/} @line;
@@ -64,8 +64,8 @@
$arg = 0;
$APPLIED[$arg] = $applied unless $APPLIED[$arg];
}
- } elsif ($arg =~ /^(#.*)?%[Pp]atch/) {
- $arg =~ s/^(#.*)?%[Pp]atch//;
+ } elsif ($arg =~ /^(#.*)?%?[Pp]atch/) {
+ $arg =~ s/^(#.*)?%?[Pp]atch//;
if ($arg =~ /^[0-9]/) {
$APPLIED[$arg] = $applied unless $APPLIED[$arg];
} else {
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit osc-source_validator for openSUSE:Factory
Hello community,
here is the log from the commit of package osc-source_validator for
openSUSE:Factory
checked in at Mon Apr 18 12:26:30 CEST 2011.
--- osc-source_validator/osc-source_validator.changes 2011-04-12
16:41:33.0 +0200
+++
/mounts/work_src_done/STABLE/osc-source_validator/osc-source_validator.changes
2011-04-18 01:07:34.0 +0200
@@ -1,0 +2,7 @@
+Mon Apr 18 01:06:59 CEST 2011 - r...@suse.de
+
+- Also check if files are tracked by osc
+- catch some more syntax variants in check_patches_applied
+- do tracked-check only in osc mode
+
+---
calling whatdependson for head-i586
Other differences:
--
++ osc-source_validator.spec ++
--- /var/tmp/diff_new_pack.powERG/_old 2011-04-18 12:26:12.0 +0200
+++ /var/tmp/diff_new_pack.powERG/_new 2011-04-18 12:26:12.0 +0200
@@ -19,7 +19,7 @@
Name: osc-source_validator
Version:0.1
-Release:12
+Release:14
License:GPLv2+
Summary:osc source validator
Url:
http://en.opensuse.org/openSUSE:Build_Service_Tools#OSC_source_validator
++ 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-04-12 16:39:54.0 +0200
+++ new/osc-source_validator-0.1/20-files-present-and-referenced
2011-04-18 01:02:49.0 +0200
@@ -4,9 +4,12 @@
test "$1" = "--batchmode" && { BATCHMODE=true ; shift ; }
DIR_TO_CHECK=$1
DESTINATIONDIR=$2
+OSC_MODE=""
test -n "$DIR_TO_CHECK" || DIR_TO_CHECK=`pwd`
-test -z "$DESTINATIONDIR" -a -d "$DIR_TO_CHECK/.osc" &&
DESTINATIONDIR="$DIR_TO_CHECK/.osc"
-
+test -z "$DESTINATIONDIR" -a -d "$DIR_TO_CHECK/.osc" && {
+ DESTINATIONDIR="$DIR_TO_CHECK/.osc"
+ OSC_MODE="true"
+}
RETURN=0
@@ -49,6 +52,7 @@
/^%global/{;p;d;}
/^%include/d
/^%rubygems_requires/d
+ /^%gconf_schemas_prereq/d
/^%requires_eq/{;p;d;}
/^%requires_ge/{;p;d;}
/^%ifarch/{
@@ -123,23 +127,40 @@
#
touch $TMPDIR/sources.t
grep -aq "command not found" $TMPDIR/sources && {
-echo "$0 seems to have problems evaluating macros in specfile."
-COMD=`grep -a "command not found" $TMPDIR/sources | head -n 1 | sed -e
"s@.*: \([^:]*\): command not found@\1@"`
-echo "command \"$COMD\" is not available used in the following defines:"
-grep -a "%define.*$COMD" $DIR_TO_CHECK/*.spec
-cleanup_and_exit 1
+ echo "$0 seems to have problems evaluating macros in specfile."
+ COMD=`grep -a "command not found" $TMPDIR/sources | head -n 1 | sed -e
"s@.*: \([^:]*\): command not found@\1@"`
+ echo "command \"$COMD\" is not available used in the following defines:"
+ grep -a "%define.*$COMD" $DIR_TO_CHECK/*.spec
+ cleanup_and_exit 1
}
for i in `cat $TMPDIR/sources` ; do
- echo "${i##*/}" >> $TMPDIR/sources.t
+ echo "${i##*/}" >> $TMPDIR/sources.t
done
mv $TMPDIR/sources.t $TMPDIR/sources
+check_tracked()
+{
+ local file=${1##*/}
+
+ if ! test -f "$DIR_TO_CHECK/$file"; then
+ echo "$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
+ fi
+ if grep -qsFx "$file" "$DESTINATIONDIR/_to_be_added"; then
+ return 0
+ fi
+ echo "$file mentioned in spec file is not tracked."
+ return 1
+ fi
+}
+
for HASTOBETHER in `cat $TMPDIR/sources` ; do
-test -f $DIR_TO_CHECK/$HASTOBETHER || {
- echo $HASTOBETHER mentioned in spec file does not exist.
- RETURN=1
-}
+check_tracked "$HASTOBETHER" || RETURN=1
done
#
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-04-12
16:39:54.0 +0200
+++ new/osc-source_validator-0.1/helpers/check_patches_applied 2011-04-18
01:02:49.0 +0200
@@ -41,7 +41,8 @@
my $applied = (/^#/) ? 2 :1;
my @line = split (/\s+/,$_);
my $had_P = grep {/^-P/} @line;
- while (my $arg = shift (@line)) {
+ while (@line) {
+ my $arg = shift (@line);
if ($arg eq "-P") {
$arg = shift (@line);
if ($arg
commit osc-source_validator for openSUSE:Factory
Hello community,
here is the log from the commit of package osc-source_validator for
openSUSE:Factory
checked in at Thu Apr 14 09:38:49 CEST 2011.
--- osc-source_validator/osc-source_validator.changes 2011-04-04
13:15:28.0 +0200
+++
/mounts/work_src_done/STABLE/osc-source_validator/osc-source_validator.changes
2011-04-12 16:41:33.0 +0200
@@ -1,0 +2,6 @@
+Tue Apr 12 16:40:58 CEST 2011 - r...@suse.de
+
+- activate the patches_applied check for real,
+ errors out if errors found
+
+---
calling whatdependson for head-i586
Other differences:
--
++ osc-source_validator.spec ++
--- /var/tmp/diff_new_pack.ZBsbh9/_old 2011-04-14 09:38:24.0 +0200
+++ /var/tmp/diff_new_pack.ZBsbh9/_new 2011-04-14 09:38:24.0 +0200
@@ -19,7 +19,7 @@
Name: osc-source_validator
Version:0.1
-Release:10
+Release:12
License:GPLv2+
Summary:osc source validator
Url:
http://en.opensuse.org/openSUSE:Build_Service_Tools#OSC_source_validator
++ osc-source_validator-0.1.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osc-source_validator-0.1/30-patches-applied
new/osc-source_validator-0.1/30-patches-applied
--- old/osc-source_validator-0.1/30-patches-applied 2011-04-04
13:13:05.0 +0200
+++ new/osc-source_validator-0.1/30-patches-applied 2011-04-12
16:39:54.0 +0200
@@ -15,7 +15,7 @@
test "$VERBOSE" = true && echo -n "."
RETURN=0
# WARNING only at the moment, just complain loudly ...
-/usr/lib/osc/source_validators/helpers/check_patches_applied $BATCHMODE $i
|| echo "## HAD ERRORS ##"
+/usr/lib/osc/source_validators/helpers/check_patches_applied $BATCHMODE $i
|| RETURN=1
done
test "$VERBOSE" = true && echo "done"
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-04-04
13:13:05.0 +0200
+++ new/osc-source_validator-0.1/helpers/check_patches_applied 2011-04-12
16:39:54.0 +0200
@@ -9,6 +9,7 @@
my $filename = $ARGV[0];
$filename =~ s/^.*\///g;
my @PATCHES;
+my @PATCHES_COMMENTED;
my @APPLIED;
my $errors = 0;
@@ -25,6 +26,7 @@
while (<>) {
if (/^(#\s*)?[Pp]atch[0-9\s]*:/) {
my ($front,$back) = split(":",$_,2);
+ my $commented = ($front =~ /^#/) ? 1 : 0;
$front =~ s/^(#\s*)?[Pp]atch//;
$front =~ s/\s*$//;
$front = 0 unless $front;
@@ -32,6 +34,7 @@
$back =~ s/^\s*//;
$back =~ s/^.*\///g;
$PATCHES[$front] = $back;
+ $PATCHES_COMMENTED[$front] = 1 if $commented;
next;
}
if (/^(#.*)?%[Pp]atch/) {
@@ -90,6 +93,10 @@
print STDERR "$col_yel(W) $filename: patch $i $PATCHES[$i]:
mentioned in specfile but not applied via %patch$col_norm\n";
next;
}
+if ($PATCHES_COMMENTED[$i]) {
+ print STDERR "$col_yel(W) $filename: patch $i $PATCHES[$i]: is
commented out$col_norm\n";
+next;
+ }
print STDERR "$col_red(E) $filename: patch $i $PATCHES[$i] apparently
not applied (or not applied via %patch)$col_norm\n";
$errors++;
}
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit osc-source_validator for openSUSE:Factory
Hello community, here is the log from the commit of package osc-source_validator for openSUSE:Factory checked in at Mon Apr 4 15:24:55 CEST 2011. --- osc-source_validator/osc-source_validator.changes 2011-03-30 12:38:51.0 +0200 +++ /mounts/work_src_done/STABLE/osc-source_validator/osc-source_validator.changes 2011-04-04 13:15:28.0 +0200 @@ -1,0 +2,5 @@ +Mon Apr 4 13:15:11 CEST 2011 - r...@suse.de + +- add debian special files + +--- calling whatdependson for head-i586 Other differences: -- ++ osc-source_validator.spec ++ --- /var/tmp/diff_new_pack.TBQA9m/_old 2011-04-04 15:24:24.0 +0200 +++ /var/tmp/diff_new_pack.TBQA9m/_new 2011-04-04 15:24:24.0 +0200 @@ -19,7 +19,7 @@ Name: osc-source_validator Version:0.1 -Release:7 +Release:10 License:GPLv2+ Summary:osc source validator Url: http://en.opensuse.org/openSUSE:Build_Service_Tools#OSC_source_validator ++ 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-03-30 12:37:23.0 +0200 +++ new/osc-source_validator-0.1/20-files-present-and-referenced 2011-04-04 13:13:05.0 +0200 @@ -249,14 +249,33 @@ .bsnote | \ .check_if_valid_source_dir | \ .setup | \ - debian.changelog | \ - debian.tar.gz | \ *.dsc | \ ready | \ _* | \ *.orig | \ *~ | \ - .gitignore) + .gitignore | \ + debian.changelog | \ + debian.compat | \ + debian.control | \ + debian.copyright | \ + debian.postinst | \ + debian.postrm | \ + debian.preinst | \ + debian.prerm | \ + debian.rules | \ + debian.tar.gz | \ + debian.triggers | \ + debian.*.default | \ + debian.*.dirs | \ + debian.*.files | \ + debian.*.init | \ + debian.*.install | \ + debian.*.logrotate | \ + debian.*.postinst | \ + debian.*.postrm | \ + debian.*.preinst | \ + debian.*.prerm ) ;; *) grep -a -x $BASE $TMPDIR/sources > /dev/null && continue Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit osc-source_validator for openSUSE:Factory
Hello community,
here is the log from the commit of package osc-source_validator for
openSUSE:Factory
checked in at Tue Mar 1 16:33:57 CET 2011.
--- osc-source_validator/osc-source_validator.changes 2011-01-13
14:30:29.0 +0100
+++
/mounts/work_src_done/STABLE/osc-source_validator/osc-source_validator.changes
2011-02-18 12:50:52.0 +0100
@@ -1,0 +2,13 @@
+Fri Feb 18 11:39:29 UTC 2011 - j...@novell.com
+
+- retry broken sr#59008
+- added another set of runtime-fixes.diff
+ * accept .orig and ~ files in working directories.
+ * UI consistency improved.
+
+---
+Sat Feb 12 11:10:42 UTC 2011 - r...@novell.com
+
+- 50-spec-version: show warning only once per specfile
+
+---
calling whatdependson for head-i586
Other differences:
--
++ osc-source_validator.spec ++
--- /var/tmp/diff_new_pack.ZXC6ki/_old 2011-03-01 16:28:50.0 +0100
+++ /var/tmp/diff_new_pack.ZXC6ki/_new 2011-03-01 16:28:50.0 +0100
@@ -19,7 +19,7 @@
Name: osc-source_validator
Version:0.1
-Release:1
+Release:6
License:GPLv2+
Summary:osc source validator
Url:
http://en.opensuse.org/openSUSE:Build_Service_Tools#OSC_source_validator
++ 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-01-13 12:34:45.0 +0100
+++ new/osc-source_validator-0.1/20-files-present-and-referenced
2011-03-01 15:53:30.0 +0100
@@ -254,6 +254,8 @@
*.dsc | \
ready | \
_* | \
+ *.orig | \
+ *~ | \
.gitignore)
;;
*)
@@ -264,11 +266,13 @@
if [ ! -d $DIR_TO_CHECK/.osc ] ; then
echo "!! $BASE is a directory !!"
if test "$BATCHMODE" != true ; then
- echo "remove the whole subtree with 'd'"
- echo -n "Is this correct? [N/y/d] (y to ignore) "
+ 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 || {
- if test "$ANSWER" = d -o "$ANSWER" = D ; then
+ # 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...
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osc-source_validator-0.1/50-spec-version
new/osc-source_validator-0.1/50-spec-version
--- old/osc-source_validator-0.1/50-spec-version2011-01-13
12:34:45.0 +0100
+++ new/osc-source_validator-0.1/50-spec-version2011-03-01
15:53:30.0 +0100
@@ -10,6 +10,7 @@
test "$VERBOSE" = true && echo -n "- checking version in specfile "
for i in $DIR_TO_CHECK/*.spec ; do
+WARNING_SHOWN=""
test -f $i || continue
test "$VERBOSE" = true && echo -n "."
RETURN=0
@@ -27,13 +28,16 @@
}
;;
%*)
-echo "WARNING: macro used in version line"
-echo "packager is responsible that the resulting string"
-echo "is non-empty and contains no \"-\"."
- echo "--"
- grep -A2 -B2 -a -i -e "^Version:.*%" $i
- echo "--"
- sleep 2
+ if test -z "$WARNING_SHOWN" ; then
+ echo "WARNING: macro used in version line"
+ echo "packager is responsible that the resulting string"
+ echo "is non-empty and contains no \"-\"."
+ echo "--"
+ grep -A2 -B2 -a -i -e "^Version:.*%" $i
+ echo "--"
+ WARNING_SHOWN="yes"
+ sleep 2
+ fi
;;
*-*)
echo ERROR: `basename $i` has a Version with a \"-\". This is not
allowed.
@@ -47,6 +51,7 @@
done || RETURN=1
done
+
test "$VERBOSE" = true && echo done
exit $RETURN
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional
