Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package installation-images for
openSUSE:Factory checked in at 2022-02-09 20:38:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/installation-images (Old)
and /work/SRC/openSUSE:Factory/.installation-images.new.1898 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "installation-images"
Wed Feb 9 20:38:29 2022 rev:158 rq:952083 version:17.41
Changes:
--------
--- /work/SRC/openSUSE:Factory/installation-images/installation-images.changes
2022-02-01 14:02:25.676290333 +0100
+++
/work/SRC/openSUSE:Factory/.installation-images.new.1898/installation-images.changes
2022-02-09 20:38:55.646336848 +0100
@@ -1,0 +2,14 @@
+Mon Feb 7 10:05:08 UTC 2022 - wfe...@opensuse.org
+
+- merge gh#openSUSE/installation-images#572
+- debuginfodeps: blacklist usr/bin/syslinux-mtools
+- 17.41
+
+--------------------------------------------------------------------
+Tue Feb 1 14:29:20 UTC 2022 - wfe...@opensuse.org
+
+- merge gh#openSUSE/installation-images#554
+- Support for new oscrc location
+- 17.40
+
+--------------------------------------------------------------------
Old:
----
installation-images-17.39.tar.xz
New:
----
installation-images-17.41.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ installation-images.spec ++++++
--- /var/tmp/diff_new_pack.rRcwUj/_old 2022-02-09 20:38:56.434338733 +0100
+++ /var/tmp/diff_new_pack.rRcwUj/_new 2022-02-09 20:38:56.438338742 +0100
@@ -691,7 +691,7 @@
Summary: Installation Image Files for %theme
License: GPL-2.0-or-later
Group: Metapackages
-Version: 17.39
+Version: 17.41
Release: 0
Provides: installation-images = %version-%release
Conflicts: otherproviders(installation-images)
++++++ installation-images-17.39.tar.xz -> installation-images-17.41.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-17.39/VERSION
new/installation-images-17.41/VERSION
--- old/installation-images-17.39/VERSION 2022-01-26 11:21:07.000000000
+0100
+++ new/installation-images-17.41/VERSION 2022-02-07 11:05:08.000000000
+0100
@@ -1 +1 @@
-17.39
+17.41
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-17.39/changelog
new/installation-images-17.41/changelog
--- old/installation-images-17.39/changelog 2022-01-26 11:21:07.000000000
+0100
+++ new/installation-images-17.41/changelog 2022-02-07 11:05:08.000000000
+0100
@@ -1,3 +1,11 @@
+2022-02-07: 17.41
+ - merge gh#openSUSE/installation-images#572
+ - debuginfodeps: blacklist usr/bin/syslinux-mtools
+
+2022-02-01: 17.40
+ - merge gh#openSUSE/installation-images#554
+ - Support for new oscrc location
+
2022-01-26: 17.39
- merge gh#openSUSE/installation-images#571
- use for build proper schema flavor (jsc#SLE-18820)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-17.39/debuginfodeps
new/installation-images-17.41/debuginfodeps
--- old/installation-images-17.39/debuginfodeps 2022-01-26 11:21:07.000000000
+0100
+++ new/installation-images-17.41/debuginfodeps 2022-02-07 11:05:08.000000000
+0100
@@ -25,6 +25,7 @@
# black list strange binaries
next if ($file =~ m,/usr/bin/syslinux,);
+ next if ($file =~ m,/usr/bin/syslinux-mtools,);
next if ($file =~ m,/sbin/lilo,);
next if ($file =~ m,/usr/lib/getconf/,);
# non-stripped
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-17.39/doc/index.md
new/installation-images-17.41/doc/index.md
--- old/installation-images-17.39/doc/index.md 2022-01-26 11:21:07.000000000
+0100
+++ new/installation-images-17.41/doc/index.md 2022-02-07 11:05:08.000000000
+0100
@@ -9,7 +9,7 @@
* be root
* put the installation-images directory on a *local* file system (ie. not NFS)
-* have a valid .oscrc
+* have a valid ~/.oscrc or ~/.config/osc/oscrc
Then you must run ```make``` once to build all parts.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-17.39/etc/config
new/installation-images-17.41/etc/config
--- old/installation-images-17.39/etc/config 2022-01-26 11:21:07.000000000
+0100
+++ new/installation-images-17.41/etc/config 2022-02-07 11:05:08.000000000
+0100
@@ -1,5 +1,5 @@
; OBS access data
-; looks at ~/.oscrc for user & password if necessary
+; looks at ~/.oscrc or ~/.config/osc/oscrc for user & password if necessary
[OBS]
# server = http://buildservice:5352
server = https://api.opensuse.org
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-17.39/lib/ReadConfig.pm
new/installation-images-17.41/lib/ReadConfig.pm
--- old/installation-images-17.39/lib/ReadConfig.pm 2022-01-26
11:21:07.000000000 +0100
+++ new/installation-images-17.41/lib/ReadConfig.pm 2022-02-07
11:05:08.000000000 +0100
@@ -1174,16 +1174,25 @@
my ($f, $u, $p, $s);
if($ConfigData{obs_server} !~ /\@/) {
- if(! -f "$ENV{HOME}/.oscrc") {
- die "\nError: *** osc config file ~/.oscrc missing ***\n\n";
+ my $oscrc_old = "$ENV{HOME}/.oscrc";
+ my $oscrc_new = "$ENV{HOME}/.config/osc/oscrc";
+ my $oscrc;
+ if (-f $oscrc_old) {
+ $oscrc = $oscrc_old;
+ }
+ elsif (-f $oscrc_new) {
+ $oscrc = $oscrc_new;
+ }
+ if(! -f $oscrc_old && ! -f $oscrc_new) {
+ die "\nError: *** osc config file ~/.oscrc or ~/.config/osc/oscrc
missing ***\n\n";
}
if($< == 0) {
- # to avoid problems with restrictive .oscrc permissions
- open $f, "su `stat -c %U $ENV{HOME}/.oscrc` -c 'cat $ENV{HOME}/.oscrc'
|";
+ # to avoid problems with restrictive oscrc permissions
+ open $f, "su `stat -c %U $oscrc` -c 'cat $oscrc' |";
}
else {
- open $f, "$ENV{HOME}/.oscrc";
+ open $f, $oscrc;
}
while(<$f>) {
undef $s if /^\s*\[/;
