Hello community,
here is the log from the commit of package product-builder-plugin-Tumbleweed
for openSUSE:Factory checked in at 2020-04-27 23:29:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/product-builder-plugin-Tumbleweed (Old)
and
/work/SRC/openSUSE:Factory/.product-builder-plugin-Tumbleweed.new.2738 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "product-builder-plugin-Tumbleweed"
Mon Apr 27 23:29:12 2020 rev:16 rq:797198 version:1.3.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/product-builder-plugin-Tumbleweed/product-builder-plugin-Tumbleweed.changes
2019-10-14 14:53:32.626130188 +0200
+++
/work/SRC/openSUSE:Factory/.product-builder-plugin-Tumbleweed.new.2738/product-builder-plugin-Tumbleweed.changes
2020-04-27 23:29:23.290470360 +0200
@@ -1,0 +2,6 @@
+Tue Apr 21 14:43:12 UTC 2020 - Adrian Schröter <[email protected]>
+
+- 1.3.0
+ * fix some error code return values
+
+-------------------------------------------------------------------
Old:
----
product-builder-plugins-1.2.1.obscpio
New:
----
product-builder-plugins-1.3.0.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ product-builder-plugin-Tumbleweed.spec ++++++
--- /var/tmp/diff_new_pack.MSqiUC/_old 2020-04-27 23:29:24.558472834 +0200
+++ /var/tmp/diff_new_pack.MSqiUC/_new 2020-04-27 23:29:24.562472842 +0200
@@ -1,7 +1,7 @@
#
# spec file for package product-builder-plugin-Tumbleweed
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
Summary: openSUSE - KIWI Image System
License: GPL-2.0-or-later
Group: System/Management
-Version: 1.2.1
+Version: 1.3.0
Release: 0
Source: product-builder-plugins-%version.tar.xz
Provides: product-builder-plugin = %version-%release
@@ -57,8 +57,8 @@
%dir %{_datadir}/kiwi
%dir %{_datadir}/kiwi/modules
%dir %{_datadir}/kiwi/modules/plugins
-%dir %{_datadir}/kiwi/modules/plugins/suse-tumbleweed
-%{_datadir}/kiwi/modules/plugins/suse-tumbleweed/*.pm
-%config(noreplace) %{_datadir}/kiwi/modules/plugins/suse-tumbleweed/*.ini
+%dir %{_datadir}/kiwi/modules/plugins/tumbleweed
+%{_datadir}/kiwi/modules/plugins/tumbleweed/*.pm
+%config(noreplace) %{_datadir}/kiwi/modules/plugins/tumbleweed/*.ini
%changelog
++++++ _service ++++++
--- /var/tmp/diff_new_pack.MSqiUC/_old 2020-04-27 23:29:24.590472896 +0200
+++ /var/tmp/diff_new_pack.MSqiUC/_new 2020-04-27 23:29:24.590472896 +0200
@@ -5,8 +5,8 @@
<param name="revision">SLE_15</param>
-->
<param name="scm">git</param>
- <param name="version">1.2.1</param>
- <param name="revision">1.2.1</param>
+ <param name="version">1.3.0</param>
+ <param name="revision">1.3.0</param>
</service>
<service mode="disabled" name="set_version" />
<service mode="buildtime" name="tar"/>
++++++ product-builder-plugins-1.2.1.obscpio ->
product-builder-plugins-1.3.0.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/product-builder-plugins-1.2.1/KIWIChecksumPlugin.pm
new/product-builder-plugins-1.3.0/KIWIChecksumPlugin.pm
--- old/product-builder-plugins-1.2.1/KIWIChecksumPlugin.pm 2019-10-04
11:46:27.000000000 +0200
+++ new/product-builder-plugins-1.3.0/KIWIChecksumPlugin.pm 2020-04-24
14:45:54.000000000 +0200
@@ -44,7 +44,7 @@
}
if(not defined($configpath) or not defined($configfile)) {
$this->logMsg("E", "wrong parameters in plugin initialisation\n");
- return;
+ return 1;
}
## Gather all necessary information from the inifile:
#===
@@ -82,7 +82,7 @@
or not defined($targetdir)
) {
$this->logMsg("E", "Plugin ini file <$config> seems broken!");
- return;
+ return 1;
}
$this->name($name);
$this->order($order);
@@ -105,11 +105,10 @@
sub execute {
my $this = shift;
if(not ref($this)) {
- return;
+ return 1;
}
- my $retval = 0;
if($this->{m_ready} == 0) {
- return $retval;
+ return 0;
}
my @targetmedia = $this->collect()->getMediaNumbers();
my %targets;
@@ -124,8 +123,6 @@
find({wanted => \&add_checksum, no_chdir=>1}, "docu") if -d "docu";
find({wanted => \&add_checksum, no_chdir=>1}, "media.1") if -d
"media.1";
- $retval++;
-
if (-e "CHECKSUMS") {
my $cmd = "sign -d CHECKSUMS";
my $call = $this -> callCmd($cmd);
@@ -137,7 +134,7 @@
}
}
- return $retval;
+ return 0;
}
1;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/product-builder-plugins-1.2.1/KIWIDescrPlugin.pm
new/product-builder-plugins-1.3.0/KIWIDescrPlugin.pm
--- old/product-builder-plugins-1.2.1/KIWIDescrPlugin.pm 2019-10-04
11:46:27.000000000 +0200
+++ new/product-builder-plugins-1.3.0/KIWIDescrPlugin.pm 2020-04-24
14:45:54.000000000 +0200
@@ -44,10 +44,8 @@
$configfile = $2;
}
if((! $configpath) || (! $configfile)) {
- $this->logMsg("E",
- "wrong parameters in plugin initialisation"
- );
- return;
+ $this->logMsg("E", "wrong parameters in plugin initialisation");
+ return 1;
}
my $ini = Config::IniFiles -> new( -file => "$configpath/$configfile" );
my $name = $ini->val('base', 'name');
@@ -63,10 +61,8 @@
or not defined($rezip)
or not defined($enable)
) {
- $this->logMsg("E",
- "Plugin ini file <$config> seems broken!"
- );
- return;
+ $this->logMsg("E", "Plugin ini file <$config> seems broken!");
+ return 1;
}
$this->name($name);
$this->order($order);
@@ -91,10 +87,8 @@
my $basesubdirs = $coll->basesubdirs();
if(not defined($basesubdirs)) {
## prevent crash when dereferencing
- $this->logMsg("E",
- "<basesubdirs> is undefined! Skipping <$this->name()>"
- );
- return 0;
+ $this->logMsg("E", "<basesubdirs> is undefined! Skipping
<$this->name()>");
+ return 1;
}
foreach my $dirlist($this->getSubdirLists()) {
$this->executeDir(sort @{$dirlist});
@@ -120,7 +114,7 @@
\@paths, $repoids, $distroname
);
- return 1;
+ return 0;
}
sub addLicenseFile {
@@ -152,9 +146,7 @@
$call = $this -> callCmd($cmd);
$status = $call->[0];
my $out = join("\n",@{$call->[1]});
- $this->logMsg("I",
- "Called $cmd exit status: <$status> output: $out"
- );
+ $this->logMsg("I", "Called $cmd exit status: <$status> output: $out");
unlink "$masterpath/$licensename.tar";
}
}
@@ -207,10 +199,8 @@
$status = $call->[0];
if ($status) {
my $out = join("\n",@{$call->[1]});
- $this->logMsg("E",
- "Called <$cmd> exit status: <$status> output: $out"
- );
- return 0;
+ $this->logMsg("E", "Called <$cmd> exit status: <$status> output:
$out");
+ return 1;
}
$cmd = "$this->{m_rezip} $masterpath ";
$this->logMsg("I", "Executing command <$cmd>");
@@ -218,10 +208,8 @@
$status = $call->[0];
if($status) {
my $out = join("\n",@{$call->[1]});
- $this->logMsg("E",
- "Called <$cmd> exit status: <$status> output: $out"
- );
- return 0;
+ $this->logMsg("E", "Called <$cmd> exit status: <$status> output:
$out");
+ return 1;
}
if (-x "/usr/bin/openSUSE-appstream-process")
@@ -233,16 +221,14 @@
$call = $this -> callCmd($cmd);
$status = $call->[0];
my $out = join("\n",@{$call->[1]});
- $this->logMsg("I",
- "Called $cmd exit status: <$status> output: $out"
- );
+ $this->logMsg("I", "Called $cmd exit status: <$status> output: $out");
}
if ( -f "/usr/bin/add_product_susedata" ) {
my $kwdfile = abs_path(
$this->collect()->{m_xml}->{xmlOrigFile}
);
- $kwdfile =~ s/.kiwi$/.kwd/x;
+ $kwdfile =~ s/\.(?:kiwi|xml)$/.kwd/;
$cmd = "/usr/bin/add_product_susedata";
$cmd .= " -u"; # unique filenames
$cmd .= " -k $kwdfile";
@@ -254,10 +240,8 @@
$status = $call->[0];
if($status) {
my $out = join("\n",@{$call->[1]});
- $this->logMsg("E",
- "Called <$cmd> exit status: <$status> output: $out"
- );
- return 0;
+ $this->logMsg("E", "Called <$cmd> exit status: <$status> output:
$out");
+ return 1;
}
}
@@ -265,9 +249,7 @@
$this->addLicenseFile($masterpath, "license");
foreach my $product (@{$coll->{m_products}}) {
- $this->logMsg("I",
- "Check for $product license file"
- );
+ $this->logMsg("I", "Check for $product license file");
$this->addLicenseFile($masterpath, "license-$product");
}
@@ -276,21 +258,17 @@
$call = $this -> callCmd($cmd);
$status = $call->[0];
my $out = join("\n",@{$call->[1]});
- $this->logMsg("I",
- "Called $cmd exit status: <$status> output: $out"
- );
+ $this->logMsg("I", "Called $cmd exit status: <$status> output: $out");
# detached pubkey
$cmd = "sign -p $masterpath/repodata/repomd.xml >
$masterpath/repodata/repomd.xml.key";
$call = $this -> callCmd($cmd);
$status = $call->[0];
$out = join("\n",@{$call->[1]});
- $this->logMsg("I",
- "Called $cmd exit status: <$status> output: $out"
- );
+ $this->logMsg("I", "Called $cmd exit status: <$status> output: $out");
}
- return 2;
+ return 0;
}
1;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/product-builder-plugins-1.2.1/KIWIEulaPlugin.pm
new/product-builder-plugins-1.3.0/KIWIEulaPlugin.pm
--- old/product-builder-plugins-1.2.1/KIWIEulaPlugin.pm 2019-10-04
11:46:27.000000000 +0200
+++ new/product-builder-plugins-1.3.0/KIWIEulaPlugin.pm 2020-04-24
14:45:54.000000000 +0200
@@ -42,10 +42,8 @@
$configfile = $2;
}
if ((! $configpath) || (! $configfile)) {
- $this->logMsg("E",
- "wrong parameters in plugin initialisation\n"
- );
- return;
+ $this->logMsg("E", "wrong parameters in plugin initialisation\n");
+ return 1;
}
## plugin content:
#-----------------
@@ -92,10 +90,8 @@
or not defined($oopt)
or not defined($popt)
) {
- $this->logMsg("E",
- "Plugin ini file <$config> seems broken!\n"
- );
- return;
+ $this->logMsg("E", "Plugin ini file <$config> seems broken!\n");
+ return 1;
}
$this->name($name);
$this->order($order);
@@ -137,9 +133,7 @@
my $targetdir = $dirname."/".$this->{m_requireddirs}->[1];
my $SRCFILE = FileHandle -> new();
if (! $SRCFILE -> open ("<$srcdir/$this->{m_source}")) {
- $this->logMsg("E",
- "PatternsPlugin: cannot read <$srcdir/".$this->{m_source}.">"
- );
+ $this->logMsg("E", "PatternsPlugin: cannot read
<$srcdir/".$this->{m_source}.">");
$this->logMsg("I", "Skipping plugin <".$this->name().">");
return $retval;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/product-builder-plugins-1.2.1/KIWIMiniIsoPlugin.pm
new/product-builder-plugins-1.3.0/KIWIMiniIsoPlugin.pm
--- old/product-builder-plugins-1.2.1/KIWIMiniIsoPlugin.pm 2019-10-04
11:46:27.000000000 +0200
+++ new/product-builder-plugins-1.3.0/KIWIMiniIsoPlugin.pm 2020-04-24
14:45:54.000000000 +0200
@@ -91,21 +91,20 @@
if(not ref($this)) {
return;
}
- my $retval = 0;
if($this->{m_ready} == 0) {
- return $retval;
+ return 0;
}
my $repoloc = $this->collect()->productData()->getOpt("REPO_LOCATION");
my $ismini = $this->collect()->productData()->getVar("FLAVOR");
if(not defined($ismini)) {
$this->logMsg("W", "FLAVOR not set?");
- return $retval;
+ return 0;
}
if ($ismini !~ m{mini}i) {
$this->logMsg("I",
"Nothing to do for media type <$ismini>"
);
- return $retval;
+ return 0;
}
my ($srv, $path);
if (not defined($repoloc)) {
@@ -120,7 +119,7 @@
$this->logMsg("W",
"Parsing repo-location=<$repoloc> failed!"
);
- return $retval;
+ return 0;
}
}
@@ -150,13 +149,11 @@
. "This _MIGHT_ be ok for S/390. "
. "Please verify <installation-images> package(s)";
$this->logMsg("W", $msg);
- return $retval;
+ return 0;
}
- $retval = $this -> updateGraphicsBootConfig (
+ return $this -> updateGraphicsBootConfig (
\@gfxbootfiles, $repoloc, $srv, $path
);
-
- return $retval;
}
sub removeRepoData {
@@ -165,7 +162,7 @@
$this->logMsg("I", "removing repodata from <$basedir>");
system("find", $basedir, "-name", "repodata", "-a", "-type", "d", "-exec",
"rm", "-rv", "{}", ";");
- return $this;
+ return 0;
}
sub updateGraphicsBootConfig {
@@ -174,7 +171,6 @@
my $repoloc = shift;
my $srv = shift;
my $path = shift;
- my $retval = 0;
foreach my $cfg(@{$gfxbootfiles}) {
$this->logMsg("I", "Processing file <$cfg>: ");
my $F = FileHandle -> new();
@@ -228,15 +224,14 @@
unlink $cfg;
if (! $F -> open(">$cfg")) {
$this->logMsg("E", "Cant open file for writing <$cfg>!");
- next;
+ return 1;
}
foreach(@lines) {
print $F "$_\n";
}
$F -> close();
- $retval++;
}
- return $retval;
+ return 0;
}
# borrowed from obs with permission from [email protected] to license as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/product-builder-plugins-1.2.1/Makefile
new/product-builder-plugins-1.3.0/Makefile
--- old/product-builder-plugins-1.2.1/Makefile 2019-10-04 11:46:27.000000000
+0200
+++ new/product-builder-plugins-1.3.0/Makefile 2020-04-24 14:45:54.000000000
+0200
@@ -10,7 +10,7 @@
#============================================
# Variables...
#--------------------------------------------
-KIWIPLUGINVZ = ${kiwi_prefix}/modules/plugins/suse-${version}
+KIWIPLUGINVZ = ${kiwi_prefix}/modules/plugins/${version}
install:
#============================================
++++++ product-builder-plugins.obsinfo ++++++
--- /var/tmp/diff_new_pack.MSqiUC/_old 2020-04-27 23:29:24.674473061 +0200
+++ /var/tmp/diff_new_pack.MSqiUC/_new 2020-04-27 23:29:24.674473061 +0200
@@ -1,5 +1,5 @@
name: product-builder-plugins
-version: 1.2.1
-mtime: 1570182387
-commit: 3bdefe9f70d9cf1539d437d9bb9197516cb3c1ed
+version: 1.3.0
+mtime: 1587732354
+commit: a39688ba570d6ec4a4d8c7eb9dbe2a850eed05f9
