Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package linuxrc-devtools for
openSUSE:Factory checked in at 2021-04-08 21:32:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/linuxrc-devtools (Old)
and /work/SRC/openSUSE:Factory/.linuxrc-devtools.new.2401 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "linuxrc-devtools"
Thu Apr 8 21:32:38 2021 rev:13 rq:883825 version:0.20
Changes:
--------
--- /work/SRC/openSUSE:Factory/linuxrc-devtools/linuxrc-devtools.changes
2020-07-16 14:00:32.125412476 +0200
+++
/work/SRC/openSUSE:Factory/.linuxrc-devtools.new.2401/linuxrc-devtools.changes
2021-04-08 21:32:53.583855040 +0200
@@ -1,0 +2,13 @@
+Thu Apr 8 11:25:31 UTC 2021 - [email protected]
+
+- merge gh#openSUSE/linuxrc-devtools#28
+- improved git2log parser
+- 0.20
+
+--------------------------------------------------------------------
+Thu Apr 8 11:25:20 UTC 2021 - [email protected]
+
+- merge gh#openSUSE/linuxrc-devtools#27
+- rebuild changelog file if needed
+
+--------------------------------------------------------------------
Old:
----
linuxrc-devtools-0.19.tar.xz
New:
----
linuxrc-devtools-0.20.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ linuxrc-devtools.spec ++++++
--- /var/tmp/diff_new_pack.Yy9IkH/_old 2021-04-08 21:32:54.015855514 +0200
+++ /var/tmp/diff_new_pack.Yy9IkH/_new 2021-04-08 21:32:54.019855518 +0200
@@ -1,7 +1,7 @@
#
# spec file for package linuxrc-devtools
#
-# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 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
@@ -17,7 +17,7 @@
Name: linuxrc-devtools
-Version: 0.19
+Version: 0.20
Release: 0
Source: %{name}-%{version}.tar.xz
++++++ linuxrc-devtools-0.19.tar.xz -> linuxrc-devtools-0.20.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-devtools-0.19/VERSION
new/linuxrc-devtools-0.20/VERSION
--- old/linuxrc-devtools-0.19/VERSION 2020-07-16 13:03:11.000000000 +0200
+++ new/linuxrc-devtools-0.20/VERSION 2021-04-08 13:25:31.000000000 +0200
@@ -1 +1 @@
-0.19
+0.20
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-devtools-0.19/changelog
new/linuxrc-devtools-0.20/changelog
--- old/linuxrc-devtools-0.19/changelog 2020-07-16 13:03:11.000000000 +0200
+++ new/linuxrc-devtools-0.20/changelog 2021-04-08 13:25:31.000000000 +0200
@@ -1,3 +1,9 @@
+2021-04-08: 0.20
+ - merge gh#openSUSE/linuxrc-devtools#27
+ - rebuild changelog file if needed
+ - merge gh#openSUSE/linuxrc-devtools#28
+ - improved git2log parser
+
2020-07-16: 0.19
- merge gh#openSUSE/linuxrc-devtools#25
- add --obs option to manage files needed or OBS
@@ -148,3 +154,6 @@
2014-11-05: 0.1
- added README
+2014-11-04: 0.0
+ - initial version
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-devtools-0.19/git2log
new/linuxrc-devtools-0.20/git2log
--- old/linuxrc-devtools-0.19/git2log 2020-07-16 13:03:11.000000000 +0200
+++ new/linuxrc-devtools-0.20/git2log 2021-04-08 13:25:31.000000000 +0200
@@ -272,24 +272,40 @@
#
sub get_tags
{
- my $log_entry;
-
- # the end of the merge commit if in a merge
- my $merge;
+ my $pre_parsed;
+ my $current;
for (@{$config->{raw_log}}) {
if(/^commit (\S+)( \((.*)\))?/) {
- my $commit = $1;
- my $tag_list = $3;
- my $xtag;
+ $current = { commit => $1, tag_list => $3 };
+ push @$pre_parsed, $current;
+ }
+
+ next if !defined $current;
- # we have reached the end of the merge commit
- undef $merge if $merge && $commit =~ /^$merge/;
+ if(/^Merge: (\S+) (\S+)/) {
+ $current->{merge_end} = $1;
+ $current->{merge_start} = $2;
+ }
+
+ push @{$current->{lines}}, $_;
+ }
- # ignore tag info inside a merge commit
- $tag_list = "" if $merge;
+ # the end of the merge commit if in a merge
+ my $merge;
+ my $log_entry;
- for my $t (split /, /, $tag_list) {
+ for my $p (@$pre_parsed) {
+ my $xtag;
+
+ # we have reached the end of the merge commit
+ if((defined($merge) && $p->{commit} =~ /^$merge/) || (!defined($merge) &&
$p->{merge_end})) {
+ undef $merge;
+ }
+
+ # ignore tag info inside a merge commit
+ if(!$merge) {
+ for my $t (split /, /, $p->{tag_list}) {
if($t =~ /tag: (\S+)/) {
my $tag = $1;
my $x = is_formatted_tag $tag;
@@ -297,23 +313,27 @@
}
}
- if($xtag) {
- if($log_entry) {
- push @{$config->{log}}, $log_entry;
- last if $opt_max && @{$config->{log}} >= $opt_max;
- }
- $log_entry = { commit => $commit, tags => $xtag };
- }
- else {
- $log_entry = { commit => $commit } if !$log_entry;
+ if($p->{merge_end}) {
+ # remember end of current merge commit
+ $merge = $p->{merge_end};
}
}
- elsif(!$merge && /^Merge: (\S+)/) {
- # remember end of merge
- $merge = $1;
+
+ if(!$log_entry) {
+ $log_entry = { commit => $p->{commit} };
+ $log_entry->{tags} = $xtag if $xtag;
+ push @{$config->{log}}, $log_entry;
}
+ else {
+ if($xtag) {
+ $log_entry = { commit => $p->{commit}, tags => $xtag };
+ push @{$config->{log}}, $log_entry;
+ }
+ }
+
+ push @{$log_entry->{lines}}, @{$p->{lines}};
- push @{$log_entry->{lines}}, $_ if $log_entry;
+ last if $opt_max && @{$config->{log}} >= $opt_max;
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-devtools-0.19/make_package
new/linuxrc-devtools-0.20/make_package
--- old/linuxrc-devtools-0.19/make_package 2020-07-16 13:03:11.000000000
+0200
+++ new/linuxrc-devtools-0.20/make_package 2021-04-08 13:25:31.000000000
+0200
@@ -37,8 +37,15 @@
mkdir -p package
rm -f package/*.tar.xz package/*.changes
+extra_files=VERSION
+
git2log --changelog --format obs package/$PACKAGE_NAME.changes
+if [ -f changelog ] || grep -q ^changelog: Makefile ; then
+ git2log --changelog changelog
+ extra_files="$extra_files changelog"
+fi
+
if [ ! -d .git ] ; then
echo no git repo
exit 1
@@ -49,5 +56,5 @@
tar -r -f package/$PACKAGE_PREFIX.tar \
--mode=0664 --owner=root --group=root \
--mtime="`git show -s --format=%ci`" \
- --transform="s:^:$PACKAGE_PREFIX/:" VERSION
+ --transform="s:^:$PACKAGE_PREFIX/:" $extra_files
xz -f package/$PACKAGE_PREFIX.tar
