Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:12.1:Update
kiwi-instsource-plugins-openSUSE-12-1
kiwi-instsource-plugins-openSUSE-12-1.diff
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File kiwi-instsource-plugins-openSUSE-12-1.diff of Package kiwi-instsource-plugins-openSUSE-12-1
Index: KIWILiveTreePlugin.pm =================================================================== --- KIWILiveTreePlugin.pm.orig 2011-05-23 15:59:57.000000000 +0200 +++ KIWILiveTreePlugin.pm 2011-10-28 10:57:04.815647298 +0200 @@ -109,16 +109,6 @@ sub new } # /constructor -sub logandrename($$$$) -{ - my $this = shift; - my $dname = shift; - my $oname = shift; - my $nname = shift; - $this->logMsg("I", "Renaming $dname/$oname to $dname/$nname"); - rename("$dname/$oname", "$dname/$nname") || die "no such file!"; -} - # returns: number of patched gfxboot files sub execute { @@ -141,24 +131,22 @@ sub execute return $retval; } - my $x11cd = undef; - find( sub { if (m/kiwi-profiled-livecd-kde.i586.iso/) { $x11cd = $File::Find::name; } }, $this->handler()->collect()->basedir()); - if (!$x11cd) { + my $medium = $this->collect()->productData()->getVar("MEDIUM_NAME"); + my $cd = undef; + find( sub { if (m/.iso/) { $cd = $File::Find::name; } }, $this->handler()->collect()->basedir()); + if (!$cd) { $this->logMsg("E", "Initial CD not found\n"); exit(1); } - print "$x11cd\n"; - my $dname = dirname($x11cd); - print "$dname\n"; - my $base = basename($dname); - $base =~ s,openSUSE-Live-Tree-i586-x86_64,,; - - #logandrename($this, $dname, "kiwi-profiled-livecd-x11.i586.iso", "openSUSE-X11-LiveCD-i686-$base.iso"); - #logandrename($this, $dname, "kiwi-profiled-livecd-x11.x86_64.iso", "openSUSE-X11-LiveCD-x86_64-$base.iso"); - logandrename($this, $dname, "kiwi-profiled-livecd-kde.i586.iso", "openSUSE-KDE-LiveCD-i686$base.iso"); - logandrename($this, $dname, "kiwi-profiled-livecd-kde.x86_64.iso", "openSUSE-KDE-LiveCD-x86_64$base.iso"); - logandrename($this, $dname, "kiwi-profiled-livecd-gnome.i586.iso", "openSUSE-GNOME-LiveCD-i686$base.iso"); - logandrename($this, $dname, "kiwi-profiled-livecd-gnome.x86_64.iso", "openSUSE-GNOME-LiveCD-x86_64$base.iso"); + $this->logMsg("I", "$cd $medium"); + my $dname = dirname($cd); + $this->logMsg("I", "$dname"); + + my $nname = "$medium.iso"; + $nname =~ s,-i586-,-i686-,; + + $this->logMsg("I", "Renaming $cd to $dname/$nname"); + rename($cd, "$dname/$nname") || $this->logMsg("E", "could not rename $cd"); return $retval; } Index: KIWIDescrPlugin.pm =================================================================== --- KIWIDescrPlugin.pm.orig 2011-05-23 15:59:57.000000000 +0200 +++ KIWIDescrPlugin.pm 2011-10-28 10:58:49.035658734 +0200 @@ -230,6 +230,13 @@ sub executeDir return 1; } } + # one more time for english to insert possible EULAs + my $cmd = "/usr/bin/translate_packages.pl en < $targetdir/packages.en > $targetdir/packages.en.new && mv $targetdir/packages.en.new $targetdir/packages.en"; + my $data = qx( $cmd ); + if($? >> 8) { + $this->logMsg("E", "Calling <translate_packages.pl en > failed:\n$data\n"); + return 1; + } if($this->{m_compress} =~ m{yes}i) { foreach my $pfile(glob("$targetdir/packages*")) {
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor