Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at Tue Feb 22 20:23:18 CET 2011.
-------- --- kiwi/kiwi.changes 2011-02-21 17:02:33.000000000 +0100 +++ kiwi/kiwi.changes 2011-02-22 18:05:20.000000000 +0100 @@ -1,0 +2,38 @@ +Tue Feb 22 18:01:00 CET 2011 - [email protected] + +- v4.78 released + +------------------------------------------------------------------- +Tue Feb 22 18:00:35 CET 2011 - [email protected] + +- added check to enforce the "no whitespace" rule for profile names + +------------------------------------------------------------------- +Tue Feb 22 17:35:41 CET 2011 - [email protected] + +- enhanced patternType check which now allows the use of the patternType + attribute for all <packages> specifications that add packages to the + image + +------------------------------------------------------------------- +Tue Feb 22 17:32:29 CET 2011 - [email protected] + +- fixed suse-min-gnome example, empty vmx package section doesn't make sense + +------------------------------------------------------------------- +Tue Feb 22 17:28:50 CET 2011 - [email protected] + +- fixed cleanup of shared memory segments and semaphores + by a valid destructor in KIWISharedMem.pm + +------------------------------------------------------------------- +Tue Feb 22 17:12:33 CET 2011 - [email protected] + +- fixed regexp in __checkPatternTypeAttrConsistent() + +------------------------------------------------------------------- +Tue Feb 22 14:37:24 CET 2011 - [email protected] + +- fixed locale Makefile, wrong use of equals operator + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.xYdwzI/_old 2011-02-22 20:22:00.000000000 +0100 +++ /var/tmp/diff_new_pack.xYdwzI/_new 2011-02-22 20:22:00.000000000 +0100 @@ -65,7 +65,7 @@ %endif %endif Summary: OpenSuSE - KIWI Image System -Version: 4.77 +Version: 4.78 Release: 1 Group: System/Management License: GPLv2 ++++++ kiwi-docu.tar.bz2 ++++++ kiwi/kiwi-docu.tar.bz2 kiwi/kiwi-docu.tar.bz2 differ: char 11, line 1 ++++++ kiwi.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision --- old/kiwi/.revision 2011-02-21 16:58:20.000000000 +0100 +++ new/kiwi/.revision 2011-02-22 18:02:35.000000000 +0100 @@ -1 +1 @@ -5f3313aa0d960dad976dc17ec038e7ec80fcf22a +d32fb17debadd5fa678e69503183bf70ad1eeb51 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/kiwi.pl new/kiwi/kiwi.pl --- old/kiwi/kiwi.pl 2011-02-21 16:58:20.000000000 +0100 +++ new/kiwi/kiwi.pl 2011-02-22 18:02:35.000000000 +0100 @@ -47,7 +47,7 @@ #============================================ # Globals (Version) #-------------------------------------------- -our $Version = "4.77"; +our $Version = "4.78"; our $Publisher = "SUSE LINUX Products GmbH"; our $Preparer = "KIWI - http://kiwi.berlios.de";; our $openSUSE = "http://download.opensuse.org";; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/locale/Makefile new/kiwi/locale/Makefile --- old/kiwi/locale/Makefile 2010-07-09 14:28:56.000000000 +0200 +++ new/kiwi/locale/Makefile 2011-02-22 17:48:14.000000000 +0100 @@ -11,7 +11,7 @@ ./.locale for i in `ls -1 .`; do \ if [ -d ./$$i ];then \ - if [ ! "$$i" = "kiwi-help" ] && [ ! "$$i" == "kiwi-template" ];then \ + if [ ! "$$i" = "kiwi-help" ] && [ ! "$$i" = "kiwi-template" ];then \ ( cd ./$$i/${LC} && msgfmt -o kiwi.mo kiwi.po ) ;\ fi \ fi \ @@ -21,7 +21,7 @@ install: for i in `ls -1 .`; do \ if [ -d ./$$i ];then \ - if [ ! "$$i" = "kiwi-help" ] && [ ! "$$i" == "kiwi-template" ];then \ + if [ ! "$$i" = "kiwi-help" ] && [ ! "$$i" = "kiwi-template" ];then \ install -d -m 755 ${KIWILOCVZ}/$$i/${LC} ;\ test -e ./$$i/${LC}/kiwi.mo && \ install -m 644 ./$$i/${LC}/kiwi.mo ${KIWILOCVZ}/$$i/${LC} || true ;\ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWISharedMem.pm new/kiwi/modules/KIWISharedMem.pm --- old/kiwi/modules/KIWISharedMem.pm 2009-03-10 10:30:11.000000000 +0100 +++ new/kiwi/modules/KIWISharedMem.pm 2011-02-22 17:48:14.000000000 +0100 @@ -185,4 +185,12 @@ return $this; } +#========================================== +# DESTRUCTOR +#------------------------------------------ +sub DESTROY { + my $this = shift; + $this -> closeSegment(); +} + 1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIXMLValidator.pm new/kiwi/modules/KIWIXMLValidator.pm --- old/kiwi/modules/KIWIXMLValidator.pm 2011-02-21 15:15:26.000000000 +0100 +++ new/kiwi/modules/KIWIXMLValidator.pm 2011-02-22 18:02:35.000000000 +0100 @@ -335,7 +335,7 @@ } } # Set up a hash for specified profiles for packages, if a profile is used - # multiple times, the value of patternType must be the same for eac use + # multiple times, the value of patternType must be the same for each use my %profPatternUseMap = (); for my $pkgs (@pkgsNodes) { my $profiles = $pkgs -> getAttribute( "profiles" ); @@ -346,7 +346,7 @@ $patternType = 'onlyRequired'; } for my $profName (@profNames) { - if (! grep /$profName/, (keys %profPatternUseMap) ) { + if (! grep /^$profName$/, (keys %profPatternUseMap) ) { $profPatternUseMap{$profName} = $patternType; } elsif ( $profPatternUseMap{$profName} ne $patternType) { my $kiwi = $this->{kiwi}; @@ -409,15 +409,14 @@ # --- my $this = shift; my @pkgsNodes = $this->{systemTree} -> getElementsByTagName("packages"); - my @allowedTypes = qw /bootstrap image/; + my @notAllowedTypes = qw /delete/; for my $pkgs (@pkgsNodes) { if ($pkgs -> getAttribute( "patternType" )) { my $type = $pkgs -> getAttribute( "type"); - if (! grep /$type/, @allowedTypes) { + if (grep /$type/, @notAllowedTypes) { my $kiwi = $this->{kiwi}; - my $msg = 'The patternType atribute may only be used for ' - . '<packages> specification of type "bootstrap" and ' - . 'type "image".'; + my $msg = 'The patternType atribute is not allowed on a ' + . "<packages> specification of type $type."; $kiwi -> error ( $msg ); $kiwi -> failed (); return undef @@ -507,6 +506,28 @@ } #========================================== +# __checkProfileNames +#------------------------------------------ +sub __checkProfileNames { + # ... + # Check that a profile name does not contain whitespace. + # --- + my $this = shift; + my @profiles = $this->{systemTree} -> getElementsByTagName('profile'); + for my $prof (@profiles) { + my $name = $prof -> getAttribute('name'); + if ($name =~ /\s/) { + my $kiwi = $this -> {kiwi}; + my $msg = 'Name of a profile may not contain whitespace.'; + $kiwi -> error ($msg); + $kiwi -> failed(); + return undef; + } + } + return 1; +} + +#========================================== # __checkReferencedProfDefined #------------------------------------------ sub __checkReferencedProfDefined { @@ -543,8 +564,8 @@ } if (! $foundit) { my $msg = 'Found reference to profile "' - . $profile - . '" but this profile is not defined.'; + . $profile + . '" but this profile is not defined.'; $kiwi -> error ($msg); $kiwi -> failed (); $status = undef; @@ -738,6 +759,9 @@ if (! $this -> __checkPreferencesDefinition()) { return undef; } + if (! $this -> __checkProfileNames()) { + return undef; + } if (! $this -> __checkReferencedProfDefined()) { return undef; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/data/xmlValidator/patternTattrUseInvalid_2.xml new/kiwi/tests/unit/data/xmlValidator/patternTattrUseInvalid_2.xml --- old/kiwi/tests/unit/data/xmlValidator/patternTattrUseInvalid_2.xml 2011-02-21 15:15:26.000000000 +0100 +++ new/kiwi/tests/unit/data/xmlValidator/patternTattrUseInvalid_2.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<image schemaversion="4.9" name="suse-11.3-oem-preload"> - <description type="system"> - <author>Robert Schweikert</author> - <contact>[email protected]</contact> - <specification>test use of patternType attribute</specification> - </description> - <preferences> - <type image="oem" filesystem="ext4" boot="oemboot/suse-11.3" installiso="true" installboot="install"> - <oemconfig> - <oem-reboot>true</oem-reboot> - <oem-swap>false</oem-swap> - <oem-unattended>true</oem-unattended> - </oemconfig> - </type> - <type image="vmx" filesystem="ext4" boot="vmxboot/suse-11.3" format="vmdk"/> - <version>1.0.0</version> - <packagemanager>zypper</packagemanager> - <rpm-check-signatures>false</rpm-check-signatures> - <rpm-force>true</rpm-force> - <locale>en_US</locale> - <keytable>us.map.gz</keytable> - </preferences> - <users group="root"> - <user pwd="linux" pwdformat="plain" home="/root" name="root"/> - </users> - <repository type="yast2"> - <source path="opensuse://11.3/repo/oss/"/> - </repository> - <packages type="image" patternType="plusRecommended"> - <package name="bootsplash-branding-openSUSE" bootinclude="true" bootdelete="true"/> - <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true"/> - <package name="kernel-default"/> - <package name="vi"/> - <opensusePattern name="default"/> - </packages> - <packages type="bootstrap" patternType="plusRecommended"> - <package name="filesystem"/> - <package name="glibc-locale"/> - </packages> - <packages type="iso" patternType="plusRecommended"> - <package name="evolution"/> - <package name="firefox"/> - </packages> -</image> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/data/xmlValidator/patternTattrUseInvalid_3.xml new/kiwi/tests/unit/data/xmlValidator/patternTattrUseInvalid_3.xml --- old/kiwi/tests/unit/data/xmlValidator/patternTattrUseInvalid_3.xml 2011-02-21 15:15:26.000000000 +0100 +++ new/kiwi/tests/unit/data/xmlValidator/patternTattrUseInvalid_3.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<image schemaversion="4.9" name="suse-11.3-oem-preload"> - <description type="system"> - <author>Robert Schweikert</author> - <contact>[email protected]</contact> - <specification>test use of paternType attribute</specification> - </description> - <preferences> - <type image="oem" filesystem="ext4" boot="oemboot/suse-11.3" installiso="true" installboot="install"> - <oemconfig> - <oem-reboot>true</oem-reboot> - <oem-swap>false</oem-swap> - <oem-unattended>true</oem-unattended> - </oemconfig> - </type> - <type image="vmx" filesystem="ext4" boot="vmxboot/suse-11.3" format="vmdk"/> - <version>1.0.0</version> - <packagemanager>zypper</packagemanager> - <rpm-check-signatures>false</rpm-check-signatures> - <rpm-force>true</rpm-force> - <locale>en_US</locale> - <keytable>us.map.gz</keytable> - </preferences> - <users group="root"> - <user pwd="linux" pwdformat="plain" home="/root" name="root"/> - </users> - <repository type="yast2"> - <source path="opensuse://11.3/repo/oss/"/> - </repository> - <packages type="image" patternType="plusRecommended"> - <package name="bootsplash-branding-openSUSE" bootinclude="true" bootdelete="true"/> - <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true"/> - <package name="kernel-default"/> - <package name="vi"/> - <opensusePattern name="default"/> - </packages> - <packages type="bootstrap" patternType="plusRecommended"> - <package name="filesystem"/> - <package name="glibc-locale"/> - </packages> - <packages type="oem" patternType="plusRecommended"> - <package name="evolution"/> - <package name="firefox"/> - </packages> -</image> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/data/xmlValidator/patternTattrUseInvalid_4.xml new/kiwi/tests/unit/data/xmlValidator/patternTattrUseInvalid_4.xml --- old/kiwi/tests/unit/data/xmlValidator/patternTattrUseInvalid_4.xml 2011-02-21 15:15:26.000000000 +0100 +++ new/kiwi/tests/unit/data/xmlValidator/patternTattrUseInvalid_4.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<image schemaversion="4.9" name="suse-11.3-oem-preload"> - <description type="system"> - <author>Robert Schweikert</author> - <contact>[email protected]</contact> - <specification>test use of patternType attribute</specification> - </description> - <preferences> - <type image="oem" filesystem="ext4" boot="oemboot/suse-11.3" installiso="true" installboot="install"> - <oemconfig> - <oem-reboot>true</oem-reboot> - <oem-swap>false</oem-swap> - <oem-unattended>true</oem-unattended> - </oemconfig> - </type> - <type image="vmx" filesystem="ext4" boot="vmxboot/suse-11.3" format="vmdk"/> - <version>1.0.0</version> - <packagemanager>zypper</packagemanager> - <rpm-check-signatures>false</rpm-check-signatures> - <rpm-force>true</rpm-force> - <locale>en_US</locale> - <keytable>us.map.gz</keytable> - </preferences> - <users group="root"> - <user pwd="linux" pwdformat="plain" home="/root" name="root"/> - </users> - <repository type="yast2"> - <source path="opensuse://11.3/repo/oss/"/> - </repository> - <packages type="image" patternType="plusRecommended"> - <package name="bootsplash-branding-openSUSE" bootinclude="true" bootdelete="true"/> - <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true"/> - <package name="kernel-default"/> - <package name="vi"/> - <opensusePattern name="default"/> - </packages> - <packages type="bootstrap" patternType="plusRecommended"> - <package name="filesystem"/> - <package name="glibc-locale"/> - </packages> - <packages type="pxe" patternType="plusRecommended"> - <package name="evolution"/> - <package name="firefox"/> - </packages> -</image> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/data/xmlValidator/patternTattrUseInvalid_5.xml new/kiwi/tests/unit/data/xmlValidator/patternTattrUseInvalid_5.xml --- old/kiwi/tests/unit/data/xmlValidator/patternTattrUseInvalid_5.xml 2011-02-21 15:15:26.000000000 +0100 +++ new/kiwi/tests/unit/data/xmlValidator/patternTattrUseInvalid_5.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<image schemaversion="4.9" name="suse-11.3-oem-preload"> - <description type="system"> - <author>Robert Schweikert</author> - <contact>[email protected]</contact> - <specification>test use of patternType attribute</specification> - </description> - <preferences> - <type image="oem" filesystem="ext4" boot="oemboot/suse-11.3" installiso="true" installboot="install"> - <oemconfig> - <oem-reboot>true</oem-reboot> - <oem-swap>false</oem-swap> - <oem-unattended>true</oem-unattended> - </oemconfig> - </type> - <type image="vmx" filesystem="ext4" boot="vmxboot/suse-11.3" format="vmdk"/> - <version>1.0.0</version> - <packagemanager>zypper</packagemanager> - <rpm-check-signatures>false</rpm-check-signatures> - <rpm-force>true</rpm-force> - <locale>en_US</locale> - <keytable>us.map.gz</keytable> - </preferences> - <users group="root"> - <user pwd="linux" pwdformat="plain" home="/root" name="root"/> - </users> - <repository type="yast2"> - <source path="opensuse://11.3/repo/oss/"/> - </repository> - <packages type="image" patternType="plusRecommended"> - <package name="bootsplash-branding-openSUSE" bootinclude="true" bootdelete="true"/> - <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true"/> - <package name="kernel-default"/> - <package name="vi"/> - <opensusePattern name="default"/> - </packages> - <packages type="bootstrap" patternType="plusRecommended"> - <package name="filesystem"/> - <package name="glibc-locale"/> - </packages> - <packages type="split" patternType="plusRecommended"> - <package name="evolution"/> - <package name="firefox"/> - </packages> -</image> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/data/xmlValidator/patternTattrUseInvalid_6.xml new/kiwi/tests/unit/data/xmlValidator/patternTattrUseInvalid_6.xml --- old/kiwi/tests/unit/data/xmlValidator/patternTattrUseInvalid_6.xml 2011-02-21 15:15:26.000000000 +0100 +++ new/kiwi/tests/unit/data/xmlValidator/patternTattrUseInvalid_6.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<image schemaversion="4.9" name="suse-11.3-oem-preload"> - <description type="system"> - <author>Robert Schweikert</author> - <contact>[email protected]</contact> - <specification>test use of patternType attribute</specification> - </description> - <preferences> - <type image="oem" filesystem="ext4" boot="oemboot/suse-11.3" installiso="true" installboot="install"> - <oemconfig> - <oem-reboot>true</oem-reboot> - <oem-swap>false</oem-swap> - <oem-unattended>true</oem-unattended> - </oemconfig> - </type> - <type image="vmx" filesystem="ext4" boot="vmxboot/suse-11.3" format="vmdk"/> - <version>1.0.0</version> - <packagemanager>zypper</packagemanager> - <rpm-check-signatures>false</rpm-check-signatures> - <rpm-force>true</rpm-force> - <locale>en_US</locale> - <keytable>us.map.gz</keytable> - </preferences> - <users group="root"> - <user pwd="linux" pwdformat="plain" home="/root" name="root"/> - </users> - <repository type="yast2"> - <source path="opensuse://11.3/repo/oss/"/> - </repository> - <packages type="image" patternType="plusRecommended"> - <package name="bootsplash-branding-openSUSE" bootinclude="true" bootdelete="true"/> - <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true"/> - <package name="kernel-default"/> - <package name="vi"/> - <opensusePattern name="default"/> - </packages> - <packages type="bootstrap" patternType="plusRecommended"> - <package name="filesystem"/> - <package name="glibc-locale"/> - </packages> - <packages type="usb" patternType="plusRecommended"> - <package name="evolution"/> - <package name="firefox"/> - </packages> -</image> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/data/xmlValidator/patternTattrUseInvalid_7.xml new/kiwi/tests/unit/data/xmlValidator/patternTattrUseInvalid_7.xml --- old/kiwi/tests/unit/data/xmlValidator/patternTattrUseInvalid_7.xml 2011-02-21 15:15:26.000000000 +0100 +++ new/kiwi/tests/unit/data/xmlValidator/patternTattrUseInvalid_7.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<image schemaversion="4.9" name="suse-11.3-oem-preload"> - <description type="system"> - <author>Robert Schweikert</author> - <contact>[email protected]</contact> - <specification>test use of patternType attribute use</specification> - </description> - <preferences> - <type image="oem" filesystem="ext4" boot="oemboot/suse-11.3" installiso="true" installboot="install"> - <oemconfig> - <oem-reboot>true</oem-reboot> - <oem-swap>false</oem-swap> - <oem-unattended>true</oem-unattended> - </oemconfig> - </type> - <type image="vmx" filesystem="ext4" boot="vmxboot/suse-11.3" format="vmdk"/> - <version>1.0.0</version> - <packagemanager>zypper</packagemanager> - <rpm-check-signatures>false</rpm-check-signatures> - <rpm-force>true</rpm-force> - <locale>en_US</locale> - <keytable>us.map.gz</keytable> - </preferences> - <users group="root"> - <user pwd="linux" pwdformat="plain" home="/root" name="root"/> - </users> - <repository type="yast2"> - <source path="opensuse://11.3/repo/oss/"/> - </repository> - <packages type="image" patternType="plusRecommended"> - <package name="bootsplash-branding-openSUSE" bootinclude="true" bootdelete="true"/> - <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true"/> - <package name="kernel-default"/> - <package name="vi"/> - <opensusePattern name="default"/> - </packages> - <packages type="bootstrap" patternType="plusRecommended"> - <package name="filesystem"/> - <package name="glibc-locale"/> - </packages> - <packages type="vmx" patternType="plusRecommended"> - <package name="evolution"/> - <package name="firefox"/> - </packages> -</image> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/data/xmlValidator/patternTattrUseValid_4.xml new/kiwi/tests/unit/data/xmlValidator/patternTattrUseValid_4.xml --- old/kiwi/tests/unit/data/xmlValidator/patternTattrUseValid_4.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/kiwi/tests/unit/data/xmlValidator/patternTattrUseValid_4.xml 2011-02-22 17:48:14.000000000 +0100 @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="utf-8"?> +<image schemaversion="4.9" name="suse-11.3-oem-preload"> + <description type="system"> + <author>Robert Schweikert</author> + <contact>[email protected]</contact> + <specification>test use of patternType attribute</specification> + </description> + <preferences> + <type image="oem" filesystem="ext4" boot="oemboot/suse-11.3" installiso="true" installboot="install"> + <oemconfig> + <oem-reboot>true</oem-reboot> + <oem-swap>false</oem-swap> + <oem-unattended>true</oem-unattended> + </oemconfig> + </type> + <type image="vmx" filesystem="ext4" boot="vmxboot/suse-11.3" format="vmdk"/> + <version>1.0.0</version> + <packagemanager>zypper</packagemanager> + <rpm-check-signatures>false</rpm-check-signatures> + <rpm-force>true</rpm-force> + <locale>en_US</locale> + <keytable>us.map.gz</keytable> + </preferences> + <users group="root"> + <user pwd="linux" pwdformat="plain" home="/root" name="root"/> + </users> + <repository type="yast2"> + <source path="opensuse://11.3/repo/oss/"/> + </repository> + <packages type="image" patternType="plusRecommended"> + <package name="bootsplash-branding-openSUSE" bootinclude="true" bootdelete="true"/> + <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true"/> + <package name="kernel-default"/> + <package name="vi"/> + <opensusePattern name="default"/> + </packages> + <packages type="bootstrap" patternType="plusRecommended"> + <package name="filesystem"/> + <package name="glibc-locale"/> + </packages> + <packages type="iso" patternType="plusRecommended"> + <package name="evolution"/> + <package name="firefox"/> + </packages> +</image> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/data/xmlValidator/patternTattrUseValid_5.xml new/kiwi/tests/unit/data/xmlValidator/patternTattrUseValid_5.xml --- old/kiwi/tests/unit/data/xmlValidator/patternTattrUseValid_5.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/kiwi/tests/unit/data/xmlValidator/patternTattrUseValid_5.xml 2011-02-22 17:48:14.000000000 +0100 @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="utf-8"?> +<image schemaversion="4.9" name="suse-11.3-oem-preload"> + <description type="system"> + <author>Robert Schweikert</author> + <contact>[email protected]</contact> + <specification>test use of paternType attribute</specification> + </description> + <preferences> + <type image="oem" filesystem="ext4" boot="oemboot/suse-11.3" installiso="true" installboot="install"> + <oemconfig> + <oem-reboot>true</oem-reboot> + <oem-swap>false</oem-swap> + <oem-unattended>true</oem-unattended> + </oemconfig> + </type> + <type image="vmx" filesystem="ext4" boot="vmxboot/suse-11.3" format="vmdk"/> + <version>1.0.0</version> + <packagemanager>zypper</packagemanager> + <rpm-check-signatures>false</rpm-check-signatures> + <rpm-force>true</rpm-force> + <locale>en_US</locale> + <keytable>us.map.gz</keytable> + </preferences> + <users group="root"> + <user pwd="linux" pwdformat="plain" home="/root" name="root"/> + </users> + <repository type="yast2"> + <source path="opensuse://11.3/repo/oss/"/> + </repository> + <packages type="image" patternType="plusRecommended"> + <package name="bootsplash-branding-openSUSE" bootinclude="true" bootdelete="true"/> + <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true"/> + <package name="kernel-default"/> + <package name="vi"/> + <opensusePattern name="default"/> + </packages> + <packages type="bootstrap" patternType="plusRecommended"> + <package name="filesystem"/> + <package name="glibc-locale"/> + </packages> + <packages type="oem" patternType="plusRecommended"> + <package name="evolution"/> + <package name="firefox"/> + </packages> +</image> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/data/xmlValidator/patternTattrUseValid_6.xml new/kiwi/tests/unit/data/xmlValidator/patternTattrUseValid_6.xml --- old/kiwi/tests/unit/data/xmlValidator/patternTattrUseValid_6.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/kiwi/tests/unit/data/xmlValidator/patternTattrUseValid_6.xml 2011-02-22 17:48:14.000000000 +0100 @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="utf-8"?> +<image schemaversion="4.9" name="suse-11.3-oem-preload"> + <description type="system"> + <author>Robert Schweikert</author> + <contact>[email protected]</contact> + <specification>test use of patternType attribute</specification> + </description> + <preferences> + <type image="oem" filesystem="ext4" boot="oemboot/suse-11.3" installiso="true" installboot="install"> + <oemconfig> + <oem-reboot>true</oem-reboot> + <oem-swap>false</oem-swap> + <oem-unattended>true</oem-unattended> + </oemconfig> + </type> + <type image="vmx" filesystem="ext4" boot="vmxboot/suse-11.3" format="vmdk"/> + <version>1.0.0</version> + <packagemanager>zypper</packagemanager> + <rpm-check-signatures>false</rpm-check-signatures> + <rpm-force>true</rpm-force> + <locale>en_US</locale> + <keytable>us.map.gz</keytable> + </preferences> + <users group="root"> + <user pwd="linux" pwdformat="plain" home="/root" name="root"/> + </users> + <repository type="yast2"> + <source path="opensuse://11.3/repo/oss/"/> + </repository> + <packages type="image" patternType="plusRecommended"> + <package name="bootsplash-branding-openSUSE" bootinclude="true" bootdelete="true"/> + <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true"/> + <package name="kernel-default"/> + <package name="vi"/> + <opensusePattern name="default"/> + </packages> + <packages type="bootstrap" patternType="plusRecommended"> + <package name="filesystem"/> + <package name="glibc-locale"/> + </packages> + <packages type="pxe" patternType="plusRecommended"> + <package name="evolution"/> + <package name="firefox"/> + </packages> +</image> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/data/xmlValidator/patternTattrUseValid_7.xml new/kiwi/tests/unit/data/xmlValidator/patternTattrUseValid_7.xml --- old/kiwi/tests/unit/data/xmlValidator/patternTattrUseValid_7.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/kiwi/tests/unit/data/xmlValidator/patternTattrUseValid_7.xml 2011-02-22 17:48:14.000000000 +0100 @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="utf-8"?> +<image schemaversion="4.9" name="suse-11.3-oem-preload"> + <description type="system"> + <author>Robert Schweikert</author> + <contact>[email protected]</contact> + <specification>test use of patternType attribute</specification> + </description> + <preferences> + <type image="oem" filesystem="ext4" boot="oemboot/suse-11.3" installiso="true" installboot="install"> + <oemconfig> + <oem-reboot>true</oem-reboot> + <oem-swap>false</oem-swap> + <oem-unattended>true</oem-unattended> + </oemconfig> + </type> + <type image="vmx" filesystem="ext4" boot="vmxboot/suse-11.3" format="vmdk"/> + <version>1.0.0</version> + <packagemanager>zypper</packagemanager> + <rpm-check-signatures>false</rpm-check-signatures> + <rpm-force>true</rpm-force> + <locale>en_US</locale> + <keytable>us.map.gz</keytable> + </preferences> + <users group="root"> + <user pwd="linux" pwdformat="plain" home="/root" name="root"/> + </users> + <repository type="yast2"> + <source path="opensuse://11.3/repo/oss/"/> + </repository> + <packages type="image" patternType="plusRecommended"> + <package name="bootsplash-branding-openSUSE" bootinclude="true" bootdelete="true"/> + <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true"/> + <package name="kernel-default"/> + <package name="vi"/> + <opensusePattern name="default"/> + </packages> + <packages type="bootstrap" patternType="plusRecommended"> + <package name="filesystem"/> + <package name="glibc-locale"/> + </packages> + <packages type="split" patternType="plusRecommended"> + <package name="evolution"/> + <package name="firefox"/> + </packages> +</image> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/data/xmlValidator/patternTattrUseValid_8.xml new/kiwi/tests/unit/data/xmlValidator/patternTattrUseValid_8.xml --- old/kiwi/tests/unit/data/xmlValidator/patternTattrUseValid_8.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/kiwi/tests/unit/data/xmlValidator/patternTattrUseValid_8.xml 2011-02-22 17:48:14.000000000 +0100 @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="utf-8"?> +<image schemaversion="4.9" name="suse-11.3-oem-preload"> + <description type="system"> + <author>Robert Schweikert</author> + <contact>[email protected]</contact> + <specification>test use of patternType attribute</specification> + </description> + <preferences> + <type image="oem" filesystem="ext4" boot="oemboot/suse-11.3" installiso="true" installboot="install"> + <oemconfig> + <oem-reboot>true</oem-reboot> + <oem-swap>false</oem-swap> + <oem-unattended>true</oem-unattended> + </oemconfig> + </type> + <type image="vmx" filesystem="ext4" boot="vmxboot/suse-11.3" format="vmdk"/> + <version>1.0.0</version> + <packagemanager>zypper</packagemanager> + <rpm-check-signatures>false</rpm-check-signatures> + <rpm-force>true</rpm-force> + <locale>en_US</locale> + <keytable>us.map.gz</keytable> + </preferences> + <users group="root"> + <user pwd="linux" pwdformat="plain" home="/root" name="root"/> + </users> + <repository type="yast2"> + <source path="opensuse://11.3/repo/oss/"/> + </repository> + <packages type="image" patternType="plusRecommended"> + <package name="bootsplash-branding-openSUSE" bootinclude="true" bootdelete="true"/> + <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true"/> + <package name="kernel-default"/> + <package name="vi"/> + <opensusePattern name="default"/> + </packages> + <packages type="bootstrap" patternType="plusRecommended"> + <package name="filesystem"/> + <package name="glibc-locale"/> + </packages> + <packages type="usb" patternType="plusRecommended"> + <package name="evolution"/> + <package name="firefox"/> + </packages> +</image> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/data/xmlValidator/patternTattrUseValid_9.xml new/kiwi/tests/unit/data/xmlValidator/patternTattrUseValid_9.xml --- old/kiwi/tests/unit/data/xmlValidator/patternTattrUseValid_9.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/kiwi/tests/unit/data/xmlValidator/patternTattrUseValid_9.xml 2011-02-22 17:48:14.000000000 +0100 @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="utf-8"?> +<image schemaversion="4.9" name="suse-11.3-oem-preload"> + <description type="system"> + <author>Robert Schweikert</author> + <contact>[email protected]</contact> + <specification>test use of patternType attribute use</specification> + </description> + <preferences> + <type image="oem" filesystem="ext4" boot="oemboot/suse-11.3" installiso="true" installboot="install"> + <oemconfig> + <oem-reboot>true</oem-reboot> + <oem-swap>false</oem-swap> + <oem-unattended>true</oem-unattended> + </oemconfig> + </type> + <type image="vmx" filesystem="ext4" boot="vmxboot/suse-11.3" format="vmdk"/> + <version>1.0.0</version> + <packagemanager>zypper</packagemanager> + <rpm-check-signatures>false</rpm-check-signatures> + <rpm-force>true</rpm-force> + <locale>en_US</locale> + <keytable>us.map.gz</keytable> + </preferences> + <users group="root"> + <user pwd="linux" pwdformat="plain" home="/root" name="root"/> + </users> + <repository type="yast2"> + <source path="opensuse://11.3/repo/oss/"/> + </repository> + <packages type="image" patternType="plusRecommended"> + <package name="bootsplash-branding-openSUSE" bootinclude="true" bootdelete="true"/> + <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true"/> + <package name="kernel-default"/> + <package name="vi"/> + <opensusePattern name="default"/> + </packages> + <packages type="bootstrap" patternType="plusRecommended"> + <package name="filesystem"/> + <package name="glibc-locale"/> + </packages> + <packages type="vmx" patternType="plusRecommended"> + <package name="evolution"/> + <package name="firefox"/> + </packages> +</image> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/data/xmlValidator/profileNameInvalid_1.xml new/kiwi/tests/unit/data/xmlValidator/profileNameInvalid_1.xml --- old/kiwi/tests/unit/data/xmlValidator/profileNameInvalid_1.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/kiwi/tests/unit/data/xmlValidator/profileNameInvalid_1.xml 2011-02-22 18:02:35.000000000 +0100 @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="utf-8"?> +<image schemaversion="5.1" name="suse-11.3-xen-guest"> + <description type="system"> + <author>Marcus Schäfer</author> + <contact>[email protected]</contact> + <specification>test profile name validation</specification> + </description> + <profiles> + <profile name="xen Flavour" description="VMX with Xen kernel" import="true"/> + </profiles> + <preferences> + <type primary="true" image="oem" filesystem="ext4" boot="oemboot/suse-11.3" installiso="true" installboot="install"> + <oemconfig> + <oem-reboot>true</oem-reboot> + <oem-swap>false</oem-swap> + <oem-unattended>true</oem-unattended> + </oemconfig> + </type> + <version>1.1.2</version> + <packagemanager>zypper</packagemanager> + <rpm-check-signatures>false</rpm-check-signatures> + <rpm-force>true</rpm-force> + <locale>en_US</locale> + <keytable>us.map.gz</keytable> + </preferences> + <preferences profiles="xen Flavour"> + <type image="vmx" filesystem="ext3" boot="vmxboot/suse-11.3" bootprofile="xen" bootkernel="xenk"> + <machine memory="128" domain="domU"> + <vmdisk controller="ide" id="0" device="/dev/xvda"/> + <vmnic interface="br0" mac="00:0C:6E:AA:57:2F"/> + </machine> + </type> + </preferences> + <users group="root"> + <user pwd="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root"/> + </users> + <repository type="yast2"> + <source path="opensuse://11.3/repo/oss/"/> + </repository> + <packages type="image"> + <package name="bootsplash-branding-openSUSE" bootinclude="true" bootdelete="true"/> + <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true"/> + <package name="ifplugd"/> + <package name="vim"/> + <package name="xen-tools-domU"/> + <package name="xen"/> + <opensusePattern name="base"/> + </packages> + <packages type="image" profiles="xen Flavour"> + <package name="kernel-xen" replaces="kernel-default"/> + </packages> + <packages type="bootstrap"> + <package name="filesystem"/> + <package name="glibc-locale"/> + </packages> +</image> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/data/xmlValidator/profileNameValid_1.xml new/kiwi/tests/unit/data/xmlValidator/profileNameValid_1.xml --- old/kiwi/tests/unit/data/xmlValidator/profileNameValid_1.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/kiwi/tests/unit/data/xmlValidator/profileNameValid_1.xml 2011-02-22 18:02:35.000000000 +0100 @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="utf-8"?> +<image schemaversion="5.1" name="suse-11.3-xen-guest"> + <description type="system"> + <author>Marcus Schäfer</author> + <contact>[email protected]</contact> + <specification>test profile name validation</specification> + </description> + <profiles> + <profile name="xenFlavour" description="VMX with Xen kernel" import="true"/> + </profiles> + <preferences> + <type primary="true" image="oem" filesystem="ext4" boot="oemboot/suse-11.3" installiso="true" installboot="install"> + <oemconfig> + <oem-reboot>true</oem-reboot> + <oem-swap>false</oem-swap> + <oem-unattended>true</oem-unattended> + </oemconfig> + </type> + <version>1.1.2</version> + <packagemanager>zypper</packagemanager> + <rpm-check-signatures>false</rpm-check-signatures> + <rpm-force>true</rpm-force> + <locale>en_US</locale> + <keytable>us.map.gz</keytable> + </preferences> + <preferences profiles="xenFlavour"> + <type image="vmx" filesystem="ext3" boot="vmxboot/suse-11.3" bootprofile="xen" bootkernel="xenk"> + <machine memory="128" domain="domU"> + <vmdisk controller="ide" id="0" device="/dev/xvda"/> + <vmnic interface="br0" mac="00:0C:6E:AA:57:2F"/> + </machine> + </type> + </preferences> + <users group="root"> + <user pwd="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root"/> + </users> + <repository type="yast2"> + <source path="opensuse://11.3/repo/oss/"/> + </repository> + <packages type="image"> + <package name="bootsplash-branding-openSUSE" bootinclude="true" bootdelete="true"/> + <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true"/> + <package name="ifplugd"/> + <package name="vim"/> + <package name="xen-tools-domU"/> + <package name="xen"/> + <opensusePattern name="base"/> + </packages> + <packages type="image" profiles="xenFlavour"> + <package name="kernel-xen" replaces="kernel-default"/> + </packages> + <packages type="bootstrap"> + <package name="filesystem"/> + <package name="glibc-locale"/> + </packages> +</image> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/lib/Test/xmlValidator.pm new/kiwi/tests/unit/lib/Test/xmlValidator.pm --- old/kiwi/tests/unit/lib/Test/xmlValidator.pm 2011-02-21 15:15:26.000000000 +0100 +++ new/kiwi/tests/unit/lib/Test/xmlValidator.pm 2011-02-22 18:02:36.000000000 +0100 @@ -418,8 +418,8 @@ $validator -> validate(); my $kiwi = $this -> {kiwi}; my $msg = $kiwi -> getMessage(); - my $expectedMsg = 'The patternType atribute may only be used for ' - . '<packages> specification of type "bootstrap" and type "image".'; + my $expectedMsg = 'The patternType atribute is not allowed on a ' + . '<packages> specification of type delete.'; $this -> assert_str_equals($expectedMsg, $msg); my $msgT = $kiwi -> getMessageType(); $this -> assert_str_equals('error', $msgT); @@ -467,6 +467,33 @@ $this -> __verifyValid(@validConfigs); } +#========================================== +# test_profileName +#------------------------------------------ +sub test_profileName { + # ... + # Test that the profile name convention is enforced properly. + # --- + my $this = shift; + my @invalidConfigs = $this -> __getInvalidFiles('profileName'); + for my $iConfFile (@invalidConfigs) { + my $validator = $this -> __getValidator($iConfFile); + $validator -> validate(); + my $kiwi = $this -> {kiwi}; + my $msg = $kiwi -> getMessage(); + my $expectedMsg = 'Name of a profile may not contain whitespace.'; + $this -> assert_str_equals($expectedMsg, $msg); + my $msgT = $kiwi -> getMessageType(); + $this -> assert_str_equals('error', $msgT); + my $state = $kiwi -> getState(); + $this -> assert_str_equals('failed', $state); + # Test this condition last to get potential error messages + $this -> assert_not_null($validator); + } + my @validConfigs = $this -> __getValidFiles('profileName'); + $this -> __verifyValid(@validConfigs); +} + #========================================== # test_profileReferenceExist #------------------------------------------ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
