Hello community, here is the log from the commit of package kiwi checked in at Mon Oct 8 12:22:36 CEST 2007. -------- --- arch/i386/kiwi/kiwi.changes 2007-10-05 15:21:49.000000000 +0200 +++ /mounts/work_src_done/STABLE/kiwi/kiwi.changes 2007-10-05 16:33:29.751166000 +0200 @@ -1,0 +2,6 @@ +Fri Oct 5 16:28:43 CEST 2007 - ms@suse.de + +- v1.67 +- fixed jabber setup + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.u29869/_old 2007-10-08 12:22:23.000000000 +0200 +++ /var/tmp/diff_new_pack.u29869/_new 2007-10-08 12:22:23.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kiwi (Version 1.66) +# spec file for package kiwi (Version 1.67) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -18,7 +18,7 @@ %endif Requires: perl perl-XML-LibXML perl-libwww-perl screen coreutils Summary: OpenSuSE - KIWI Image System -Version: 1.66 +Version: 1.67 Release: 1 Group: System/Management License: GPL v2 or later @@ -330,6 +330,9 @@ %{_datadir}/kiwi/image/oemboot/suse* %changelog * Fri Oct 05 2007 - ms@suse.de +- v1.67 +- fixed jabber setup +* Fri Oct 05 2007 - ms@suse.de - v1.66 - added ata drivers to isoboot boot image (#299663) - create /etc/sysconfig/bootsplash which is used by the distro ++++++ kiwi.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/kiwi.pl new/kiwi/kiwi.pl --- old/kiwi/kiwi.pl 2007-10-05 15:06:12.000000000 +0200 +++ new/kiwi/kiwi.pl 2007-10-05 16:26:44.000000000 +0200 @@ -32,7 +32,7 @@ #============================================ # Globals (Version) #-------------------------------------------- -our $Version = "1.66"; +our $Version = "1.67"; our $openSUSE = "http://software.opensuse.org/download/"; our $ConfigFile = "$ENV{'HOME'}/.kiwirc"; our $ConfigStatus = 0; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/modules/KIWILog.pm new/kiwi/modules/KIWILog.pm --- old/kiwi/modules/KIWILog.pm 2007-10-05 15:06:08.000000000 +0200 +++ new/kiwi/modules/KIWILog.pm 2007-10-05 16:26:39.000000000 +0200 @@ -660,10 +660,15 @@ my $jclient; my @jresult; my $jstatus; - if (($main::ConfigStatus) && - ((! defined $main::JabberServer) ||(! defined $main::JabberUserName) || - (! defined $main::JabberPassword)||(! defined $main::JabberRessource)|| - (! defined $main::JabberComponent)) + if (! $main::ConfigStatus) { + return undef; + } + if ( + (! defined $main::JabberServer) || + (! defined $main::JabberUserName) || + (! defined $main::JabberPassword) || + (! defined $main::JabberRessource) || + (! defined $main::JabberComponent) ) { #$this -> warning ("Jabber setup skipped: Missing login data"); #$this -> skipped (); @@ -682,21 +687,21 @@ $this -> failed (); $this -> error ("Server is not answering: $!"); $this -> skipped (); - } else { - $this -> done(); - $this -> info ("Login to Jabber server: $main::JabberUserName"); - @jresult = $jclient -> AuthSend ( - username => $main::JabberUserName, - password => $main::JabberPassword, - resource => $main::JabberRessource - ); - if ($jresult[0] ne "ok") { - $this -> error ("Failed: $jresult[0] $jresult[1]"); - $this -> skipped (); - } else { - $this -> done (); - } + return $this; + } + $this -> done(); + $this -> info ("Login to Jabber server: $main::JabberUserName"); + @jresult = $jclient -> AuthSend ( + username => $main::JabberUserName, + password => $main::JabberPassword, + resource => $main::JabberRessource + ); + if ($jresult[0] ne "ok") { + $this -> error ("Failed: $jresult[0] $jresult[1]"); + $this -> skipped (); + return $this; } + $this -> done (); #========================================== # Store object data #------------------------------------------ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/.revision new/kiwi/.revision --- old/kiwi/.revision 2007-10-05 15:20:43.000000000 +0200 +++ new/kiwi/.revision 2007-10-05 16:31:54.000000000 +0200 @@ -1 +1 @@ -684 \ No newline at end of file +685 \ No newline at end of file ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org