Hello community,
here is the log from the commit of package product-builder-plugin-Tumbleweed
for openSUSE:Factory checked in at 2019-10-14 14:53:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/product-builder-plugin-Tumbleweed (Old)
and
/work/SRC/openSUSE:Factory/.product-builder-plugin-Tumbleweed.new.2352 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "product-builder-plugin-Tumbleweed"
Mon Oct 14 14:53:31 2019 rev:15 rq:734951 version:1.2.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/product-builder-plugin-Tumbleweed/product-builder-plugin-Tumbleweed.changes
2019-02-11 11:58:54.787204507 +0100
+++
/work/SRC/openSUSE:Factory/.product-builder-plugin-Tumbleweed.new.2352/product-builder-plugin-Tumbleweed.changes
2019-10-14 14:53:32.626130188 +0200
@@ -1,0 +2,12 @@
+Fri Sep 27 09:53:19 UTC 2019 - Adrian Schröter <adr...@suse.de>
+
+- update to version 1.2.0
+ * adding content tags in repositories (SLE-7695)
+
+-------------------------------------------------------------------
+Tue Sep 17 11:31:22 UTC 2019 - Adrian Schröter <adr...@suse.de>
+
+- update to version 1.1.0
+ * createrepo_c errors due to invalid data are handled as error now
+
+-------------------------------------------------------------------
Old:
----
product-builder-plugins-1.1~pre.1549882033.98140aa.obscpio
New:
----
product-builder-plugins-1.2.1.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ product-builder-plugin-Tumbleweed.spec ++++++
--- /var/tmp/diff_new_pack.f1k9eQ/_old 2019-10-14 14:53:33.066129040 +0200
+++ /var/tmp/diff_new_pack.f1k9eQ/_new 2019-10-14 14:53:33.066129040 +0200
@@ -20,7 +20,7 @@
Summary: openSUSE - KIWI Image System
License: GPL-2.0-or-later
Group: System/Management
-Version: 1.1~pre.1549882033.98140aa
+Version: 1.2.1
Release: 0
Source: product-builder-plugins-%version.tar.xz
Provides: product-builder-plugin = %version-%release
++++++ _service ++++++
--- /var/tmp/diff_new_pack.f1k9eQ/_old 2019-10-14 14:53:33.090128978 +0200
+++ /var/tmp/diff_new_pack.f1k9eQ/_new 2019-10-14 14:53:33.094128967 +0200
@@ -5,7 +5,8 @@
<param name="revision">SLE_15</param>
-->
<param name="scm">git</param>
- <param name="versionprefix">1.1~pre</param>
+ <param name="version">1.2.1</param>
+ <param name="revision">1.2.1</param>
</service>
<service mode="disabled" name="set_version" />
<service mode="buildtime" name="tar"/>
++++++ product-builder-plugins-1.1~pre.1549882033.98140aa.obscpio ->
product-builder-plugins-1.2.1.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/product-builder-plugins-1.1~pre.1549882033.98140aa/KIWIBasePlugin.pm
new/product-builder-plugins-1.2.1/KIWIBasePlugin.pm
--- old/product-builder-plugins-1.1~pre.1549882033.98140aa/KIWIBasePlugin.pm
2019-02-11 11:47:13.000000000 +0100
+++ new/product-builder-plugins-1.2.1/KIWIBasePlugin.pm 2019-10-04
11:46:27.000000000 +0200
@@ -209,7 +209,7 @@
}
my @ret = ();
my $coll = $this->{m_collect};
- my $dbm = $coll->productData()->getOpt("DEBUGMEDIUM");
+ my $dbm = $coll->productData()->getOpt("DEBUGMEDIUM") // 0;
my $flavor = $coll->productData()->getVar("FLAVOR");
my $basesubdirs = $coll->basesubdirs();
my @paths = values(%{$basesubdirs});
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/product-builder-plugins-1.1~pre.1549882033.98140aa/KIWIDescrPlugin.pm
new/product-builder-plugins-1.2.1/KIWIDescrPlugin.pm
--- old/product-builder-plugins-1.1~pre.1549882033.98140aa/KIWIDescrPlugin.pm
2019-02-11 11:47:13.000000000 +0100
+++ new/product-builder-plugins-1.2.1/KIWIDescrPlugin.pm 2019-10-04
11:46:27.000000000 +0200
@@ -97,7 +97,7 @@
return 0;
}
foreach my $dirlist($this->getSubdirLists()) {
- my ($s,$m) = $this->executeDir(sort @{$dirlist});
+ $this->executeDir(sort @{$dirlist});
}
return 0;
}
@@ -114,15 +114,10 @@
return 0;
}
my $coll = $this->{m_collect};
- my $cpeid = $coll->productData()->getInfo("CPEID");
- my $repoid = $coll->productData()->getInfo("REPOID");
- my $metadataonly = $coll->productData()->getVar("RPMHDRS_ONLY");
- my $params = "$this->{m_params} -H" ? $metadataonly eq "true" :
"$this->{m_params}";
-
- my $distroname = $coll->productData()->getInfo("DISTRIBUTION")."."
- . $coll->productData()->getInfo("VERSION");
+ my $repoids = $coll->productData()->getInfo("REPOID");
+ my $distroname = $coll->productData()->getInfo("DISTRO");
my $result = $this -> createRepositoryMetadata(
- \@paths, $repoid, $distroname, $cpeid
+ \@paths, $repoids, $distroname
);
return 1;
@@ -171,7 +166,6 @@
my $masterpath = @{$paths}[0];
my $repoids = $params[2];
my $distroname = $params[3];
- my $cpeid = $params[4];
my $cmd;
my $call;
my $status;
@@ -179,19 +173,35 @@
$cmd = "$this->{m_createrepo}";
$cmd .= " --unique-md-filenames";
+ # the glob is only matching on files, so we need it for every directory
depth
+ $cmd .= " --excludes=boot/*.rpm";
+ $cmd .= " --excludes=boot/*/*.rpm";
$cmd .= " --checksum=sha256";
$cmd .= " --no-database";
+ $cmd .= " --error-exit-val"; # is not working with old createrepo
foreach my $repoid (split(/\s+/, $repoids)) {
$cmd .= " --repo=\"$repoid\"";
}
- $cmd .= " --distro=\"$cpeid,$distroname\"" if $cpeid && $distroname;
+ $cmd .= " --distro=\"$distroname\"" if $distroname;
if (@{$paths} > 1) {
$cmd .= " --split";
$cmd .= " --baseurl=media://";
}
+
+ ### set repository tags
+ my $debugmedium =
$this->{m_collect}->productData()->getOpt("DEBUGMEDIUM");
+ my $sourcemedium =
$this->{m_collect}->productData()->getOpt("SOURCEMEDIUM");
+ foreach my $p (@{$paths}) {
+ $cmd .= " --content=\"debug\"" if $debugmedium && $p =~
m{.*$debugmedium$}x;
+ $cmd .= " --content=\"source\"" if $sourcemedium && $p =~
m{.*$sourcemedium$}x;
+ }
+ my $flavor = $this->{m_collect}->productData()->getVar("FLAVOR");
+ $cmd .= " --content=\"pool\"" if $flavor =~ m{ftp}i || $flavor =~ m{pool}i;
+
foreach my $p (@{$paths}) {
$cmd .= " $p";
}
+ $cmd .= " 2>&1"; # verbose output
$this->logMsg("I", "Executing command <$cmd>");
$call = $this -> callCmd($cmd);
$status = $call->[0];
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/product-builder-plugins-1.1~pre.1549882033.98140aa/KIWIPromoDVDPlugin.ini
new/product-builder-plugins-1.2.1/KIWIPromoDVDPlugin.ini
---
old/product-builder-plugins-1.1~pre.1549882033.98140aa/KIWIPromoDVDPlugin.ini
2019-02-11 11:47:13.000000000 +0100
+++ new/product-builder-plugins-1.2.1/KIWIPromoDVDPlugin.ini 1970-01-01
01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-[base]
-name = KIWIPromoDVDPlugin
-order = 7
-defaultenable = 0
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/product-builder-plugins-1.1~pre.1549882033.98140aa/KIWIPromoDVDPlugin.pm
new/product-builder-plugins-1.2.1/KIWIPromoDVDPlugin.pm
---
old/product-builder-plugins-1.1~pre.1549882033.98140aa/KIWIPromoDVDPlugin.pm
2019-02-11 11:47:13.000000000 +0100
+++ new/product-builder-plugins-1.2.1/KIWIPromoDVDPlugin.pm 1970-01-01
01:00:00.000000000 +0100
@@ -1,121 +0,0 @@
-################################################################
-# Copyright (c) 2014 SUSE
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program (see the file LICENSE); if not, write to the
-# Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
-#
-################################################################
-package KIWIPromoDVDPlugin;
-
-use strict;
-use warnings;
-
-use base "KIWIBasePlugin";
-use Data::Dumper;
-use Config::IniFiles;
-use File::Find;
-use File::Basename;
-
-sub new {
- # ...
- # Create a new KIWIPromoDVDPlugin object
- # ---
- my $class = shift;
- my $handler = shift;
- my $config = shift;
- my $configpath;
- my $configfile;
- my $this = KIWIBasePlugin -> new($handler);
- bless ($this, $class);
-
- if ($config =~ m{(.*)/([^/]+)$}x) {
- $configpath = $1;
- $configfile = $2;
- }
- if ((! $configpath) || (! $configfile)) {
- $this->logMsg("E",
- "wrong parameters in plugin initialisation\n"
- );
- return;
- }
- ## plugin content:
- #-----------------
- #[base]
- # name = KIWIEulaPlugin
- # order = 3
- # defaultenable = 1
- #
- #[target]
- # targetfile = content
- # targetdir = $PRODUCT_DIR
- # media = (list of numbers XOR "all")
- #
- my $ini = Config::IniFiles -> new(
- -file => "$configpath/$configfile"
- );
- my $name = $ini->val('base', 'name');
- my $order = $ini->val('base', 'order');
- my $enable = $ini->val('base', 'defaultenable');
- # if any of those isn't set, complain!
- if(not defined($name)
- or not defined($order)
- or not defined($enable)
- ) {
- $this->logMsg("E",
- "Plugin ini file <$config> seems broken!\n"
- );
- return;
- }
- $this->name($name);
- $this->order($order);
- if($enable != 0) {
- $this->ready(1);
- }
- return $this;
-}
-
-sub execute {
- my $this = shift;
- if(not ref($this)) {
- return;
- }
- if($this->{m_ready} == 0) {
- return 0;
- }
- my $ismini = $this->collect()
- ->productData()->getVar("FLAVOR");
- if(not defined($ismini)) {
- $this->logMsg("W", "FLAVOR not set?");
- return 0;
- }
- if ($ismini !~ m{dvd-promo}ix) {
- return 0;
- }
- my $medium = $this->collect()
- ->productData()->getVar("MEDIUM_NAME");
- find( sub {
- if (m/initrd.liv/x) {
- my $cd = $File::Find::name;
- system("mkdir -p boot; echo $medium > boot/mbrid");
- system("echo boot/mbrid | cpio --create --format=newc --quiet
| gzip -9 -f >> $cd");
- system("rm boot/mbrid; rmdir boot");
- $this->logMsg("I", "updated $cd");
- }
- },
- $this->handler()->collect()->basedir()
- );
- return 0;
-}
-
-1;
++++++ product-builder-plugins.obsinfo ++++++
--- /var/tmp/diff_new_pack.f1k9eQ/_old 2019-10-14 14:53:33.170128769 +0200
+++ /var/tmp/diff_new_pack.f1k9eQ/_new 2019-10-14 14:53:33.170128769 +0200
@@ -1,5 +1,5 @@
name: product-builder-plugins
-version: 1.1~pre.1549882033.98140aa
-mtime: 1549882033
-commit: 98140aab151adf801aed1d68b6316ffebe8deed9
+version: 1.2.1
+mtime: 1570182387
+commit: 3bdefe9f70d9cf1539d437d9bb9197516cb3c1ed
