Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2017-03-18 20:47:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kiwi (Old) and /work/SRC/openSUSE:Factory/.kiwi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi" Sat Mar 18 20:47:50 2017 rev:655 rq:479558 version:7.04.29 Changes: -------- --- /work/SRC/openSUSE:Factory/kiwi/kiwi.changes 2017-03-10 20:34:17.170788705 +0100 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2017-03-18 20:47:51.324787272 +0100 @@ -1,0 +2,15 @@ +Wed Mar 8 11:16:10 CET 2017 - [email protected] + +- v7.04.29 released + +------------------------------------------------------------------- +Tue Mar 7 09:26:12 CET 2017 - [email protected] + +- Make sure the disk symlink is removed before moving ovf folder + + This commit deletes a relative symlink of the vmx disk before + moving ovf files from a temporary folder to the destination folder. + + Fixes #633 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.ZSv3PJ/_old 2017-03-18 20:47:52.444628624 +0100 +++ /var/tmp/diff_new_pack.ZSv3PJ/_new 2017-03-18 20:47:52.444628624 +0100 @@ -27,7 +27,7 @@ Name: kiwi License: GPL-2.0 Group: System/Management -Version: 7.04.28 +Version: 7.04.29 Provides: kiwi-schema = 6.2 Provides: kiwi-image:aci Provides: kiwi-image:lxc ++++++ kiwi-docu.tar.bz2 ++++++ ++++++ kiwi-repo.tar.bz2 ++++++ ++++++ kiwi.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision --- old/kiwi/.revision 2016-04-18 16:58:06.610211984 +0200 +++ new/kiwi/.revision 2016-04-18 16:58:06.610211984 +0200 @@ -1 +1 @@ -092c30e4dfb6c97dedfc112d59a9d275a1f7af6c +55d2805f85eef2ec2193b61d125471ecf7e4170a diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIGlobals.pm new/kiwi/modules/KIWIGlobals.pm --- old/kiwi/modules/KIWIGlobals.pm 2017-02-21 09:24:07.285402526 +0100 +++ new/kiwi/modules/KIWIGlobals.pm 2017-03-08 11:16:05.302678078 +0100 @@ -2018,7 +2018,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "7.04.28"; + $data{Version} = "7.04.29"; $data{Publisher} = "SUSE LINUX GmbH"; $data{Preparer} = "KIWI - http://opensuse.github.com/kiwi";; $data{ConfigName} = "config.xml"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIImageFormat.pm new/kiwi/modules/KIWIImageFormat.pm --- old/kiwi/modules/KIWIImageFormat.pm 2016-07-08 09:43:46.697702432 +0200 +++ new/kiwi/modules/KIWIImageFormat.pm 2017-03-08 11:14:47.514442852 +0100 @@ -1302,6 +1302,9 @@ } KIWIQX::qxx ("mv $ovfdir $ovfdir.tmp"); KIWIQX::qxx ("mkdir -p $destdir"); + if (-l "$ovfdir.tmp/$vmdk"){ + unlink "$ovfdir.tmp/$vmdk"; + } KIWIQX::qxx ("mv -f $ovfdir.tmp/* $destdir"); KIWIQX::qxx ("rmdir $ovfdir.tmp"); return $ovf;
