Author: mlschroe Date: Mon Oct 22 19:08:55 2007 New Revision: 7597 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7597&view=rev Log: - make arch i686, not i586 - make install of Mobile selection select architecture i686. Why is there both Mobile.arch and Mobile.noarch in the selections? Modified: trunk/sat-solver/testsuite/data.libzypp/mediaorder-tests/install-all-mediaorder-test.xml trunk/sat-solver/testsuite/data.libzypp/mediaorder-tests/install-default-gnome-mediaorder-test.xml trunk/sat-solver/testsuite/data.libzypp/mediaorder-tests/install-default-mediaorder-test.xml trunk/sat-solver/testsuite/data.libzypp/mediaorder-tests/install-kde-desktop-mediaorder-test.xml Modified: trunk/sat-solver/testsuite/data.libzypp/mediaorder-tests/install-all-mediaorder-test.xml URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/mediaorder-tests/install-all-mediaorder-test.xml?rev=7597&r1=7596&r2=7597&view=diff ============================================================================== --- trunk/sat-solver/testsuite/data.libzypp/mediaorder-tests/install-all-mediaorder-test.xml (original) +++ trunk/sat-solver/testsuite/data.libzypp/mediaorder-tests/install-all-mediaorder-test.xml Mon Oct 22 19:08:55 2007 @@ -5,7 +5,7 @@ - DVD-Asia --> <test> -<setup arch="i586"> +<setup arch="i686"> <channel name="packages" file="sl10.1-beta3-packages.xml.gz"/> <channel name="selections" file="sl10.1-beta3-selections.xml.gz"/> <locale name="de"/> @@ -29,7 +29,7 @@ <install channel="selections" kind="selection" name="Laptop"/> <install channel="selections" kind="selection" name="Latex"/> <install channel="selections" kind="selection" name="LDAP-Server"/> - <install channel="selections" kind="selection" name="Mobile"/> + <install channel="selections" kind="selection" name="Mobile" arch="i686"/> <install channel="selections" kind="selection" name="Mono"/> <install channel="selections" kind="selection" name="Multimedia"/> <install channel="selections" kind="selection" name="Network"/> Modified: trunk/sat-solver/testsuite/data.libzypp/mediaorder-tests/install-default-gnome-mediaorder-test.xml URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/mediaorder-tests/install-default-gnome-mediaorder-test.xml?rev=7597&r1=7596&r2=7597&view=diff ============================================================================== --- trunk/sat-solver/testsuite/data.libzypp/mediaorder-tests/install-default-gnome-mediaorder-test.xml (original) +++ trunk/sat-solver/testsuite/data.libzypp/mediaorder-tests/install-default-gnome-mediaorder-test.xml Mon Oct 22 19:08:55 2007 @@ -5,7 +5,7 @@ incomplete: sl10.1-beta3-packages.xml does not include libboost_regex --> <test> -<setup arch="i586"> +<setup arch="i686"> <channel name="packages" file="sl10.1-beta3-packages.xml.gz"/> <channel name="selections" file="sl10.1-beta3-selections.xml.gz"/> <locale name="en"/> Modified: trunk/sat-solver/testsuite/data.libzypp/mediaorder-tests/install-default-mediaorder-test.xml URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/mediaorder-tests/install-default-mediaorder-test.xml?rev=7597&r1=7596&r2=7597&view=diff ============================================================================== --- trunk/sat-solver/testsuite/data.libzypp/mediaorder-tests/install-default-mediaorder-test.xml (original) +++ trunk/sat-solver/testsuite/data.libzypp/mediaorder-tests/install-default-mediaorder-test.xml Mon Oct 22 19:08:55 2007 @@ -5,7 +5,7 @@ incomplete: sl10.1-beta3-packages.xml does not include libboost_regex ! --> <test> -<setup arch="i586"> +<setup arch="i686"> <channel name="packages" file="sl10.1-beta3-packages.xml.gz"/> <channel name="selections" file="sl10.1-beta3-selections.xml.gz"/> <locale name="de"/> Modified: trunk/sat-solver/testsuite/data.libzypp/mediaorder-tests/install-kde-desktop-mediaorder-test.xml URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/mediaorder-tests/install-kde-desktop-mediaorder-test.xml?rev=7597&r1=7596&r2=7597&view=diff ============================================================================== --- trunk/sat-solver/testsuite/data.libzypp/mediaorder-tests/install-kde-desktop-mediaorder-test.xml (original) +++ trunk/sat-solver/testsuite/data.libzypp/mediaorder-tests/install-kde-desktop-mediaorder-test.xml Mon Oct 22 19:08:55 2007 @@ -3,7 +3,7 @@ install minmal selection --> <test> -<setup arch="i586"> +<setup arch="i686"> <channel name="packages" file="sl10.1-beta3-packages.xml.gz"/> <channel name="selections" file="sl10.1-beta3-selections.xml.gz"/> <locale name="de"/> -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org