Hello community,
here is the log from the commit of package product-builder for openSUSE:Factory
checked in at 2019-07-21 11:29:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/product-builder (Old)
and /work/SRC/openSUSE:Factory/.product-builder.new.4126 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "product-builder"
Sun Jul 21 11:29:30 2019 rev:26 rq:715659 version:1.2.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/product-builder/product-builder.changes
2019-03-05 12:16:58.976994569 +0100
+++
/work/SRC/openSUSE:Factory/.product-builder.new.4126/product-builder.changes
2019-07-21 11:29:32.152826040 +0200
@@ -1,0 +2,6 @@
+Tue Jul 16 07:38:10 UTC 2019 - Adrian Schröter <[email protected]>
+
+- 1.2.2
+ * track provided cpeid of products
+
+-------------------------------------------------------------------
Old:
----
product-builder-1.2.1.obscpio
New:
----
product-builder-1.2.2.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ product-builder.spec ++++++
--- /var/tmp/diff_new_pack.qnqmok/_old 2019-07-21 11:29:32.756825938 +0200
+++ /var/tmp/diff_new_pack.qnqmok/_new 2019-07-21 11:29:32.764825937 +0200
@@ -23,7 +23,7 @@
Name: product-builder
Conflicts: kiwi
Conflicts: kiwi-instsource
-Version: 1.2.1
+Version: 1.2.2
Release: 0
Provides: kiwi-schema = 6.2
Source: product-builder-%version.tar.xz
++++++ _service ++++++
--- /var/tmp/diff_new_pack.qnqmok/_old 2019-07-21 11:29:32.792825932 +0200
+++ /var/tmp/diff_new_pack.qnqmok/_new 2019-07-21 11:29:32.796825932 +0200
@@ -1,8 +1,8 @@
<services>
<service name="obs_scm" mode="disabled">
<param name="url">https://github.com/openSUSE/product-builder.git</param>
- <param name="revision">1.2.1</param>
- <param name="version">1.2.1</param>
+ <param name="revision">1.2.2</param>
+ <param name="version">1.2.2</param>
<param name="scm">git</param>
<param name="extract">rpm/product-builder.spec</param>
</service>
++++++ product-builder-1.2.1.obscpio -> product-builder-1.2.2.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/product-builder-1.2.1/modules/KIWICollect.pm
new/product-builder-1.2.2/modules/KIWICollect.pm
--- old/product-builder-1.2.1/modules/KIWICollect.pm 2019-01-16
15:41:37.000000000 +0100
+++ new/product-builder-1.2.2/modules/KIWICollect.pm 2019-07-16
13:15:40.000000000 +0200
@@ -1478,6 +1478,9 @@
$pkg->{localfile}, length($pkg->{repo}->{source})
)
);
+ if (defined($pkg->{cpeid}) && $pkg->{cpeid} ne "") {
+ $hash{"cpeid"} = $pkg->{cpeid};
+ }
if (defined($pkg->{epoch}) && $pkg->{epoch} ne "") {
$hash{"epoch"} = $pkg->{epoch};
}
@@ -1826,7 +1829,6 @@
$store = {};
$packPool->{$name} = $store;
}
- $store->{$repokey} = $package;
# look for products defined inside
RPMQ::rpmq_add_flagsvers(\%flags, 'PROVIDENAME',
'PROVIDEFLAGS', 'PROVIDEVERSION');
for my $provide (@{$flags{'PROVIDENAME'} || []}) {
@@ -1834,7 +1836,13 @@
$this->logMsg('I', "Found product provides for
$1");
push @$productList, $1;
}
+ if ($provide =~ /^product-cpeid\(\) = (.+)$/) {
+ $package->{'cpeid'} = $1;
+ $package->{'cpeid'} =~
s/%([a-fA-F0-9]{2})/chr(hex($1))/sge;
+ $this->logMsg('I', "Found cpeid provides for
$package->{'cpeid'}");
+ }
}
+ $store->{$repokey} = $package;
$retval++;
} # read RPM header
} # foreach URI
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/product-builder-1.2.1/product-builder
new/product-builder-1.2.2/product-builder
--- old/product-builder-1.2.1/product-builder 2019-01-16 15:41:37.000000000
+0100
+++ new/product-builder-1.2.2/product-builder 2019-07-16 13:15:40.000000000
+0200
@@ -21,7 +21,7 @@
EOF
fi
-./product-builder.pl $@
+./product-builder.pl "$@"
ecode=$?
popd $callpath &>/dev/null
++++++ product-builder.obsinfo ++++++
--- /var/tmp/diff_new_pack.qnqmok/_old 2019-07-21 11:29:32.992825899 +0200
+++ /var/tmp/diff_new_pack.qnqmok/_new 2019-07-21 11:29:32.992825899 +0200
@@ -1,5 +1,5 @@
name: product-builder
-version: 1.2.1
-mtime: 1547649697
-commit: 0682d806bcf6ea2a61b04ce10ad60b3c8149155f
+version: 1.2.2
+mtime: 1563275740
+commit: fa39a2b5a3f8bd27117afa9bca71b8512c1a77ca
