Hello community,
here is the log from the commit of package product-builder for openSUSE:Factory
checked in at 2017-10-10 11:37:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/product-builder (Old)
and /work/SRC/openSUSE:Factory/.product-builder.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "product-builder"
Tue Oct 10 11:37:55 2017 rev:11 rq:532160 version:1.0~pre.1507277845.84ea077
Changes:
--------
--- /work/SRC/openSUSE:Factory/product-builder/product-builder.changes
2017-09-27 16:53:57.678815286 +0200
+++ /work/SRC/openSUSE:Factory/.product-builder.new/product-builder.changes
2017-10-10 11:38:00.232593684 +0200
@@ -1,0 +2,5 @@
+Fri Oct 6 10:04:45 UTC 2017 - adr...@suse.de
+
+- patch README.BETA again
+
+-------------------------------------------------------------------
@@ -6 +11 @@
-- building seperate media is an explicit setting now
+- building separate media is an explicit setting now
Old:
----
product-builder-1.0~pre.1506336035.066b85a.obscpio
New:
----
product-builder-1.0~pre.1507277845.84ea077.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ product-builder.spec ++++++
--- /var/tmp/diff_new_pack.FGKz3n/_old 2017-10-10 11:38:03.404454475 +0200
+++ /var/tmp/diff_new_pack.FGKz3n/_new 2017-10-10 11:38:03.408454300 +0200
@@ -23,7 +23,7 @@
Name: product-builder
Conflicts: kiwi
Conflicts: kiwi-instsource
-Version: 1.0~pre.1506336035.066b85a
+Version: 1.0~pre.1507277845.84ea077
Release: 0
Provides: kiwi-schema = 6.2
Source: product-builder-%version.tar.xz
++++++ product-builder-1.0~pre.1506336035.066b85a.obscpio ->
product-builder-1.0~pre.1507277845.84ea077.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/product-builder-1.0~pre.1506336035.066b85a/modules/KIWICollect.pm
new/product-builder-1.0~pre.1507277845.84ea077/modules/KIWICollect.pm
--- old/product-builder-1.0~pre.1506336035.066b85a/modules/KIWICollect.pm
2017-09-25 12:48:22.000000000 +0200
+++ new/product-builder-1.0~pre.1507277845.84ea077/modules/KIWICollect.pm
2017-10-06 10:16:45.000000000 +0200
@@ -1203,7 +1203,7 @@
# the dependency solver need to tell if a package is not matching
return 1 if $number == $this->{m_debugmedium};
- return 1 if $this->{m_proddata}->getVar("SEPERATE_MEDIA") eq "true";
+ return 1 if $this->{m_proddata}->getVar("SEPARATE_MEDIA") eq "true";
return 0;
}
@@ -1370,7 +1370,22 @@
$support_fd -> close();
}
- # step 5: products file
+ # step 5: handle beta information
+ my $beta_version = $this->{m_proddata}->getOpt("BETA_VERSION");
+ my $readme_file = "$this->{m_basesubdir}->{'1'}/README.BETA";
+ if (defined($beta_version)) {
+ my $dist_string = $this->{m_proddata}->getVar("PRODUCT_SUMMARY")."
".${beta_version};
+ $dist_string = $this->{m_proddata}->getVar("PRODUCT_SUMMARY")."
".${beta_version};
+ $dist_string =~ s/\Q\/\E/\\\//g;
+ if (system("sed", "-i", "s/BETA_DIST_VERSION/$dist_string/",
$readme_file) != 0) {
+ $this->logMsg('W', "Failed to replace beta version in README.BETA
file!");
+ };
+ } elsif ( -e $readme_file ) {
+ $this->logMsg('I', "Dropping README.BETA file");
+ unlink($readme_file);
+ }
+
+ # step 6: products file
$this->logMsg('I', "Creating products file in all media:");
my $prodname = $this->{m_proddata}->getVar("PRODUCT_NAME");
my $prodsummary = $this->{m_proddata}->getVar("PRODUCT_SUMMARY");
@@ -1404,7 +1419,7 @@
close $PRODUCT;
}
- # step 6: write out the channel files based on the collected rpms
+ # step 7: write out the channel files based on the collected rpms
for my $m (keys(%{$this->{m_reportLog}})) {
my $medium = $this->{m_reportLog}->{$m};
my $fd;
++++++ product-builder.obsinfo ++++++
--- /var/tmp/diff_new_pack.FGKz3n/_old 2017-10-10 11:38:03.640444118 +0200
+++ /var/tmp/diff_new_pack.FGKz3n/_new 2017-10-10 11:38:03.644443942 +0200
@@ -1,5 +1,5 @@
name: product-builder
-version: 1.0~pre.1506336035.066b85a
-mtime: 1506336035
-commit: 066b85a68cca9eb3b3e474fe8dfc12cb8b7a893b
+version: 1.0~pre.1507277845.84ea077
+mtime: 1507277845
+commit: 84ea077b51ba138f6c0acf9fdfaa8d6f316d32d1
