Author: dmacvicar
Date: Thu Nov 6 16:55:44 2008
New Revision: 11598
URL: http://svn.opensuse.org/viewcvs/zypp?rev=11598&view=rev
Log:
- obey optional files
- more testcases
Added:
trunk/libzypp/tests/zypp/data/Fetcher/remote-site/images-file/
trunk/libzypp/tests/zypp/data/Fetcher/remote-site/images-file-unsigned/
trunk/libzypp/tests/zypp/data/Fetcher/remote-site/images-file-unsigned/content
trunk/libzypp/tests/zypp/data/Fetcher/remote-site/images-file-unsigned/images/
trunk/libzypp/tests/zypp/data/Fetcher/remote-site/images-file-unsigned/images/images.xml
trunk/libzypp/tests/zypp/data/Fetcher/remote-site/images-file/content
trunk/libzypp/tests/zypp/data/Fetcher/remote-site/images-file/content.asc
trunk/libzypp/tests/zypp/data/Fetcher/remote-site/images-file/content.key
trunk/libzypp/tests/zypp/data/Fetcher/remote-site/images-file/images/
trunk/libzypp/tests/zypp/data/Fetcher/remote-site/images-file/images/images.xml
Modified:
trunk/libzypp/tests/zypp/Fetcher_test.cc
trunk/libzypp/zypp/Fetcher.cc
Modified: trunk/libzypp/tests/zypp/Fetcher_test.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/Fetcher_test.cc?rev=11598&r1=11597&r2=11598&view=diff
==============================================================================
--- trunk/libzypp/tests/zypp/Fetcher_test.cc (original)
+++ trunk/libzypp/tests/zypp/Fetcher_test.cc Thu Nov 6 16:55:44 2008
@@ -252,6 +252,40 @@
}
}
+BOOST_AUTO_TEST_CASE(enqueue_digested_images_file_content_autoindex)
+{
+ MediaSetAccess media( ( DATADIR + "/images-file").asUrl(), "/" );
+ Fetcher fetcher;
+ filesystem::TmpDir dest;
+ {
+ OnMediaLocation loc("/images/images.xml",1);
+ fetcher.setOptions( Fetcher::AutoAddIndexes );
+ fetcher.enqueueDigested(loc);
+ fetcher.start(dest.path(), media);
+ fetcher.reset();
+ BOOST_CHECK( PathInfo(dest.path() + "/images/images.xml").isExist() );
+ fetcher.reset();
+ }
+}
+
+BOOST_AUTO_TEST_CASE(enqueue_digested_images_file_content_autoindex_unsigned)
+{
+ MediaSetAccess media( ( DATADIR + "/images-file-unsigned").asUrl(), "/" );
+ Fetcher fetcher;
+ filesystem::TmpDir dest;
+ {
+ OnMediaLocation loc("/images/images.xml",1);
+ fetcher.setOptions( Fetcher::AutoAddIndexes );
+ fetcher.enqueueDigested(loc);
+ // it should throw because unsigned file throws
+ BOOST_CHECK_THROW( fetcher.start( dest.path(), media ), FileCheckException);
+ fetcher.reset();
+ // the target file was NOT transfered
+ BOOST_CHECK( ! PathInfo(dest.path() + "/images/images.xml").isExist() );
+ fetcher.reset();
+ }
+}
+
BOOST_AUTO_TEST_CASE(enqueue_broken_content_noindex)
{
MediaSetAccess media( ( DATADIR).asUrl(), "/" );
@@ -275,7 +309,7 @@
}
-BOOST_AUTO_TEST_CASE(fetcher_remove)
+BOOST_AUTO_TEST_CASE(enqueuedir_http)
{
// at this point the key is already trusted
{
@@ -301,9 +335,35 @@
BOOST_CHECK( PathInfo(dest.path() + "/complexdir/subdir1/subdir1-file1.txt").isExist() );
BOOST_CHECK( PathInfo(dest.path() + "/complexdir/subdir1/subdir1-file2.txt").isExist() );
+ web.stop();
+ }
+}
+
+BOOST_AUTO_TEST_CASE(enqueuedir_http_broken)
+{
+ // at this point the key is already trusted
+ {
+ // add the key as trusted
+ //getZYpp()->keyRing()->importKey(PublicKey(DATADIR + "/complexdir/subdir1/SHA1SUMS.key"), true);
+
+ WebServer web((Pathname(TESTS_SRC_DIR) + "/zypp/data/Fetcher/remote-site").c_str() );
+ web.start();
+ MediaSetAccess media( Url("http://localhost:9099"), "/" );
+ Fetcher fetcher;
+ filesystem::TmpDir dest;
+
+ // auto add the SHA1SUMS
+ fetcher.setOptions( Fetcher::AutoAddIndexes );
fetcher.enqueueDir(OnMediaLocation("/complexdir-broken"), true);
- BOOST_CHECK_THROW( fetcher.start( dest.path(), media ), Exception);
+ // should throw because wrong checksum
+ BOOST_CHECK_THROW( fetcher.start( dest.path(), media ), FileCheckException);
+ fetcher.reset();
+
+ BOOST_CHECK( PathInfo(dest.path() + "/complexdir-broken/subdir2").isExist() );
+ BOOST_CHECK( PathInfo(dest.path() + "/complexdir-broken/subdir2/subdir2-file1.txt").isExist() );
+ BOOST_CHECK( PathInfo(dest.path() + "/complexdir-broken/subdir1/subdir1-file1.txt").isExist() );
+ BOOST_CHECK( PathInfo(dest.path() + "/complexdir-broken/subdir1/subdir1-file2.txt").isExist() );
fetcher.reset();
@@ -311,6 +371,7 @@
}
}
+
BOOST_AUTO_TEST_SUITE_END();
// vim: set ts=2 sts=2 sw=2 ai et:
Added: trunk/libzypp/tests/zypp/data/Fetcher/remote-site/images-file-unsigned/content
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/remote-site/images-file-unsigned/content?rev=11598&view=auto
==============================================================================
--- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/images-file-unsigned/content (added)
+++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/images-file-unsigned/content Thu Nov 6 16:55:44 2008
@@ -0,0 +1,143 @@
+CONTENTSTYLE 11
+BASEARCHS i586
+DATADIR suse
+DESCRDIR suse/setup/descr
+DISTRIBUTION openSUSE
+FLAVOR dvd
+LABEL openSUSE 11.1
+LINGUAS cs da de en en_GB en_US es fi fr hu it ja nb nl pl pt pt_BR ru sv zh zh_CN zh_TW
+NAME openSUSE
+REFERENCES openSUSE-release = 11.1
+RELNOTESURL http://www.suse.com/relnotes/i386/openSUSE/11.0.42/release-notes-openSUSE.rp...
+SUMMARY openSUSE
+VERSION 11.1
+META SHA1 dd627cf38a5dee28421690d2ec6abea7af274a50 dvd-11.1-58.1.i586.pat.gz
+META SHA1 fa49e3205fea8f95d395710a4ba79f55b4626ccd non_oss-11.1-58.1.i586.pat.gz
+META SHA1 f6c6ef681aa5fc4c5e9532f04420d54fbec033a8 packages.cs.gz
+META SHA1 cc5438a74d1b39f34bc31fbc2399ae6a95f43bc4 packages.de.gz
+META SHA1 90dfa1e81f5515769f5b16fcf31c1ab63c55ff87 packages.DU.gz
+META SHA1 b1c6b77703357297ecdd8d74b89a099ebbfe2fe6 packages.en.gz
+META SHA1 b137fc7749531183b5250ec907d4b9adf4624288 packages.es.gz
+META SHA1 3e55d6d5c21a6a1457ea6fef09c999b28883ade4 packages.fr.gz
+META SHA1 b5b6092d57a701d4052ad2bb047636c68ac31d8b packages.gz
+META SHA1 a893937892aeff71da1c38aa06f3cce5ba02de1c packages.hu.gz
+META SHA1 f6c6ef681aa5fc4c5e9532f04420d54fbec033a8 packages.sk.gz
+META SHA1 1d66972a977913541c7cb7130d61ec0e751148ba patterns
+HASH SHA1 4ae30edd0588114b642bbb08fbd3fb71d7af257d license.tar.gz
+HASH SHA1 67d82aa5cd4f08cf77cc70fe9ca1834a4b6212cc control.xml
+HASH SHA1 e727c621ded4324cc61e94c615dbd423436f63e4 media.1/info.txt
+HASH SHA1 7442eb13ca3c184fe0d47060dbc56fd45cfcb720 boot/i386/bind
+HASH SHA1 99920bc0c322d0d0b63ac361d2f9c8f6bc9e3524 boot/i386/branding
+HASH SHA1 ca2f0bce909d73d1bfaa7cdeb98595f17e4524aa boot/i386/common
+HASH SHA1 d107fa19616c3eae9d49fe52e54971e5b9c160fa boot/i386/config
+HASH SHA1 4b7d8525b1d3588562bea71b26cdb5e48e29ff64 boot/i386/cracklib-dict-full.rpm
+HASH SHA1 1a8151b2bf88cf618be74eee60d65063386469e0 boot/i386/fonts-arabic.rpm
+HASH SHA1 79aec7c93b730c2355aebd085eddf4195a9c1d36 boot/i386/fonts-thai.rpm
+HASH SHA1 52e1040f8e0fae373d7426447b1f9d05d25b90f6 boot/i386/gdb
+HASH SHA1 a1ba35bcecde55eb36be2e89b7210998b846be9d boot/i386/indic-fonts.rpm
+HASH SHA1 6394ec4eb1883520de23bd2ac043490da6ed8fde boot/i386/initrd-xen
+HASH SHA1 6394ec4eb1883520de23bd2ac043490da6ed8fde boot/i386/initrd-xenpae
+HASH SHA1 6cebf392eaf1b17b53f3e5e88a6b6c6d8c2b76bb boot/i386/KhmerOS-fonts.rpm
+HASH SHA1 e9c779539f1b3f56a96337f262b2bc548e6b223e boot/i386/LIESMICH
+HASH SHA1 abdf17a0246be709efbcc7c0e0a68f8ad797a754 boot/i386/LIESMICH.DOS
+HASH SHA1 f51e15897e5f77c7a7b4d1600dc53be6f117d9ec boot/i386/lklug.rpm
+HASH SHA1 c4dca65aa97554bc45885b22ef4af24ad5177c75 boot/i386/mkbootdisk
+HASH SHA1 99920bc0c322d0d0b63ac361d2f9c8f6bc9e3524 boot/i386/openSUSE
+HASH SHA1 ae44557c57285f0866be41334fdaa20312ccdeab boot/i386/README
+HASH SHA1 4a71ee6114eccfb88582dc5422020cbc5a2639dd boot/i386/README.DOS
+HASH SHA1 e12efd095a7fb990d0c4be1e04999e72de84dd6a boot/i386/rescue
+HASH SHA1 73e50e6321e6938471c4fc0521e0b2dce54f0346 boot/i386/root
+HASH SHA1 9b4cced8b700c6737ab02af8f1521945c925c8f9 boot/i386/rpmlist
+HASH SHA1 2181540518e50f88e7e35c619460e746934eacd4 boot/i386/sax2
+HASH SHA1 78d3ee95682c1150aa8a95132ba1c5d0d88c23bd boot/i386/ttf-arphic-uming.rpm
+HASH SHA1 55a2d437b32d6c192c60e016756725f7a2e717e9 boot/i386/unfonts.rpm
+HASH SHA1 7c6fbdc97c11e5e03098f19c196d85cd63e5ce85 boot/i386/vmlinuz-xen
+HASH SHA1 7c6fbdc97c11e5e03098f19c196d85cd63e5ce85 boot/i386/vmlinuz-xenpae
+HASH SHA1 67d109ba80c3f396710774ff03ace955a2184dc6 boot/i386/yast2-trans-af.rpm
+HASH SHA1 3d835ea74b409914cf40ba48669a11590cffa902 boot/i386/yast2-trans-ar.rpm
+HASH SHA1 5654cabb329f0b1251d5743624fdf599b92d71e5 boot/i386/yast2-trans-bg.rpm
+HASH SHA1 1015f485542ae7c903ec9d1a9c7983d4701e2824 boot/i386/yast2-trans-bn.rpm
+HASH SHA1 454e0f1b79d2076a9ba03b23c34da3cbc3e58e25 boot/i386/yast2-trans-bs.rpm
+HASH SHA1 76bbfdb77952db51e9b21dc90ab167f2a46f4580 boot/i386/yast2-trans-ca.rpm
+HASH SHA1 59f26af0b058b47f2d821f6fa8102d58af8d0377 boot/i386/yast2-trans-cs.rpm
+HASH SHA1 db43e4829de2a26b4bb09aa1e93069af2b230377 boot/i386/yast2-trans-cy.rpm
+HASH SHA1 1aee13cb0b0a1f4e7b1bbb49e809fd13919ba7e9 boot/i386/yast2-trans-da.rpm
+HASH SHA1 36335f1ff2738071be00be65a64f7d41b7db1c33 boot/i386/yast2-trans-de.rpm
+HASH SHA1 5297e40871de03217cfee404cb88e909422ceae8 boot/i386/yast2-trans-el.rpm
+HASH SHA1 bc61efbd85302ed96ae51550a163cd0fc9ad59a3 boot/i386/yast2-trans-en_GB.rpm
+HASH SHA1 a237b73e48777fcdd42505ec1e007484d9f398da boot/i386/yast2-trans-en_US.rpm
+HASH SHA1 f2e0dba8e86a723ab72d7f7490665f8e631f63a1 boot/i386/yast2-trans-es.rpm
+HASH SHA1 ca9bd8bf05434d42b6a7c2c7549e2ce0170c6be8 boot/i386/yast2-trans-et.rpm
+HASH SHA1 57e5cd63079ac258734f28df5385e5288cd59db0 boot/i386/yast2-trans-fa.rpm
+HASH SHA1 2983eb7ba93882e52434f396b49cd6e98d7b7399 boot/i386/yast2-trans-fi.rpm
+HASH SHA1 0dfc3b38294524871f527d919ce31d6921cf77c0 boot/i386/yast2-trans-fr.rpm
+HASH SHA1 2051d343881b288c5d22aec792e9d13ec192dfd1 boot/i386/yast2-trans-gl.rpm
+HASH SHA1 49736a9798a371c3edf02f350ebe4db1e6fff011 boot/i386/yast2-trans-gu.rpm
+HASH SHA1 d9737ea270e5166cbc409466c1d2a6f16fcc9f06 boot/i386/yast2-trans-hi.rpm
+HASH SHA1 1e222655cfabbf0212e629ed1fccf304847ac732 boot/i386/yast2-trans-hr.rpm
+HASH SHA1 1b6e646f9f8abc7c33ef2dd830b72c7a2f775620 boot/i386/yast2-trans-hu.rpm
+HASH SHA1 723a18301396eccf7c0620f1f8f016719eaf7543 boot/i386/yast2-trans-id.rpm
+HASH SHA1 70c272dbe7bfe963e44e5331edd5f440450bc827 boot/i386/yast2-trans-it.rpm
+HASH SHA1 f17bc3588c7d2878821600d42fe174156971f87e boot/i386/yast2-trans-ja.rpm
+HASH SHA1 d46ea44b7d98ade64658d1cf388013093d1c0d39 boot/i386/yast2-trans-jv.rpm
+HASH SHA1 e4e684ebb7f93ac20461062544b49fe18c88627d boot/i386/yast2-trans-ka.rpm
+HASH SHA1 123eb83403b88845cb5efd9046ef39351c1b68c3 boot/i386/yast2-trans-km.rpm
+HASH SHA1 85c28913c4432f43fa29d8791d97b3e10456a42a boot/i386/yast2-trans-ko.rpm
+HASH SHA1 6692fca0c1acb85b398bcbb9150d0826ea38f2c8 boot/i386/yast2-trans-lo.rpm
+HASH SHA1 6247198d1348d31192dc158969ce8ae9252d6f0b boot/i386/yast2-trans-lt.rpm
+HASH SHA1 a630f16e50a6227f814751931bb1a1ec15981c29 boot/i386/yast2-trans-mk.rpm
+HASH SHA1 4f0bffd5cbeb7d37a7d78f1996cade7ae2ad2420 boot/i386/yast2-trans-mr.rpm
+HASH SHA1 bbc950f9fec446e9a5a5876c532cd56e060c5eb4 boot/i386/yast2-trans-nb.rpm
+HASH SHA1 edae4d58bd99064bbddd62278875b0387a2d495d boot/i386/yast2-trans-nl.rpm
+HASH SHA1 85f1dc1eef8862066050c09eef023705a5d61039 boot/i386/yast2-trans-pa.rpm
+HASH SHA1 e1eb02ebedff18a01facc150e00d05385affaa17 boot/i386/yast2-trans-pl.rpm
+HASH SHA1 c3d31be5bf8af62c537e1a70db9afc98842b3f82 boot/i386/yast2-trans-pt_BR.rpm
+HASH SHA1 b2bcd427139f2e13684a592ff186c3076a5b22d8 boot/i386/yast2-trans-pt.rpm
+HASH SHA1 7fdb3299ca8230ec363d3ee8eee24915c931790c boot/i386/yast2-trans-ro.rpm
+HASH SHA1 8b9bdb13f3b7c73e8c64303e8614e44bf640cc9f boot/i386/yast2-trans-ru.rpm
+HASH SHA1 55876ae86c10a3504bbbcd71e49564f4c0b47149 boot/i386/yast2-trans-si.rpm
+HASH SHA1 ee8ce4bc8a06b5094f8d51c79b32806531203d62 boot/i386/yast2-trans-sk.rpm
+HASH SHA1 04130a176a24ce3adb663a2bb694fd484f2a7776 boot/i386/yast2-trans-sl.rpm
+HASH SHA1 d3408d472a956ffbd1fb49354057da5c0b77879f boot/i386/yast2-trans-sr.rpm
+HASH SHA1 fda2c586ff8a17d402108f007c2c6214bcaeca3f boot/i386/yast2-trans-sv.rpm
+HASH SHA1 04021fd6654b2e7b6cbff65c094efa8c35424215 boot/i386/yast2-trans-ta.rpm
+HASH SHA1 6aaae1e49e3188b5e73bedb3c3cd044c4108cca2 boot/i386/yast2-trans-th.rpm
+HASH SHA1 6bb5903b7bc64185352c616099c344f8738bb768 boot/i386/yast2-trans-tr.rpm
+HASH SHA1 9f631f117433db5e44a6bbed7c8a50cbbe5e8ac0 boot/i386/yast2-trans-uk.rpm
+HASH SHA1 3ba5a8f4f3dc3f454e13223c2ecef9937824a611 boot/i386/yast2-trans-vi.rpm
+HASH SHA1 bc2775d3a4a0a3ca80e5a5caa51a6612e7158d32 boot/i386/yast2-trans-wa.rpm
+HASH SHA1 a3511637ca9bd4cbf5dc9eca58f8ccf5df49603c boot/i386/yast2-trans-xh.rpm
+HASH SHA1 ba8875e4c0febe1d26d27c0c948e93128f14476a boot/i386/yast2-trans-zh_CN.rpm
+HASH SHA1 d39b329ce32a0d59bebecd0d87ecfd59cb26e297 boot/i386/yast2-trans-zh_TW.rpm
+HASH SHA1 0c6f45e6b01d531ac7e821ae9e479416149e92eb boot/i386/yast2-trans-zu.rpm
+HASH SHA1 2325eb886cf06b58ca1892578383b5fcc5b11866 boot/i386/loader/linux
+HASH SHA1 586ec9beb26fb337283f3b49149d843a3fb7c821 boot/i386/loader/initrd
+HASH SHA1 d6b4db657272efe902f8ce92b53082fda4d5f1ca boot/i386/loader/08000600.spl
+HASH SHA1 22d4aeede74fdf44b3c4a2524319fe9cf418d4c6 boot/i386/loader/10240600.spl
+HASH SHA1 93e297fb9ffa23d6a167c50c318bbb46b0705e45 boot/i386/loader/10240768.spl
+HASH SHA1 8c135621ac91216c3388f9ea9c02127b2f6375a0 boot/i386/loader/12800800.spl
+HASH SHA1 54dd2bc17c9f73ad9d6a85489f99f518849cb84d boot/i386/loader/12801024.spl
+HASH SHA1 ef0f517a3f3a3240349b9bdd01e794267372c4ab boot/i386/loader/14001050.spl
+HASH SHA1 2abbc5b4c7c3dc8134ae1207f9d9e95a640046ef boot/i386/loader/16001200.spl
+HASH SHA1 e37862355648f6330b6831c69c989dec02b80ab0 boot/i386/loader/16801050.spl
+HASH SHA1 082a7887d2f43d049fdb0fc92c5051f1a5b7e663 boot/i386/loader/19201200.spl
+HASH SHA1 ed5f4a87074367bcf8396da7a9b9b3d1be6dfcb2 images/base-i386.tar.lzma
+HASH SHA1 9d055cacc983226171cdd3a3fe1acd6bb6fa044e images/base-meta-i386.tar.lzma
+HASH SHA1 361e07c44526cd43a2d477b7b3448e49e674f0a8 images/common-base-i386.tar.lzma
+HASH SHA1 6854608038e4d3b11fcc950e28ca49e4582fd2a4 images/common-desktop-i386.tar.lzma
+HASH SHA1 5f6a43158c017e188309c094cdaf24c346de3dfb images/common-xorg-i386.tar.lzma
+HASH SHA1 ce6620b820e494c042398b9fd7ed108578008168 images/details-i386.xml
+HASH SHA1 22c466bf9af3003ee95fed6f7fb93b4c8c0cd993 images/gnome-i386.tar.lzma
+HASH SHA1 49374551f38fe919cf4545d5af0fea7d45361738 images/gnome-meta-i386.tar.lzma
+HASH SHA1 d1e9a38629e353d1f0136ded670cf28213d47e6f images/images.xml
+HASH SHA1 0df7debf780a0e01b18004d18ef6ab21410b9480 images/kde-i386.tar.lzma
+HASH SHA1 c418a15669de278e523893f030c209c479f490e6 images/kde-meta-i386.tar.lzma
+HASH SHA1 6c4238796684f770a0b4ecd1ea4469e5a7a49b0d images/x11-i386.tar.lzma
+HASH SHA1 cc50a8bc9d560c8d522660feed5feb019f9b889e images/x11-meta-i386.tar.lzma
+KEY SHA1 17162a96933229a9771ee10c0976bdc047a2f53d gpg-pubkey-0dfb3188-41ed929b.asc
+KEY SHA1 f6accbb18d705bfc104c893cf7dfca1247a33f3c gpg-pubkey-307e3d54-481f30aa.asc
+KEY SHA1 47f6492d127ae9f6aac353a2dd23752fc0ed4f8d gpg-pubkey-3d25d3d9-36e12d04.asc
+KEY SHA1 2288e5849740566e4fb65b7c9dc0c7e4f43b1039 gpg-pubkey-56b4177a-47965b33.asc
+KEY SHA1 89d4bcd20a281553fd1d4ec1708603ebf88f1a59 gpg-pubkey-7e2e3b05-4816488f.asc
+KEY SHA1 06ff5171362496c0db84beeccd29967f580350b2 gpg-pubkey-9c800aca-481f343a.asc
+KEY SHA1 04544096c5c3b0ed7b01a83d79e048307c2af919 gpg-pubkey-a1912208-446a0899.asc
Added: trunk/libzypp/tests/zypp/data/Fetcher/remote-site/images-file-unsigned/images/images.xml
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/remote-site/images-file-unsigned/images/images.xml?rev=11598&view=auto
==============================================================================
--- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/images-file-unsigned/images/images.xml (added)
+++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/images-file-unsigned/images/images.xml Thu Nov 6 16:55:44 2008
@@ -0,0 +1,345 @@
+<?xml version="1.0"?>
+<!DOCTYPE images>
+http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns">
+
+
+ <patterns>base,enhanced_base,games,imaging,kde4,kde4_basis,multimedia,sw_management,x11,xgl</patterns>
+ <archs>i386</archs>
+ kde-meta-i386.tar.lzma
+ <images config:type="list">
+ <image>
+ <name>KDE [base]</name>
+ <type>tar</type>
+ <file>common-base-i386.tar.lzma</file>
+ </image>
+ <image>
+ <name>KDE [xorg]</name>
+ <type>tar</type>
+ <file>common-xorg-i386.tar.lzma</file>
+ </image>
+ <image>
+ <name>KDE [desktop]</name>
+ <type>tar</type>
+ <file>common-desktop-i386.tar.lzma</file>
+ </image>
+ <image>
+ <name>KDE</name>
+ <type>tar</type>
+ <file>kde-i386.tar.lzma</file>
+ </image>
+ <image>
+ <name>KDE [meta]</name>
+ <type>tar</type>
+ <file>kde-meta-i386.tar.lzma</file>
+ </image>
+ </images>
+
+
+ <patterns>base,enhanced_base,fonts,games,gnome,gnome_basis,imaging,multimedia,sw_management,x11,xgl</patterns>
+ <archs>i386</archs>
+ gnome-meta-i386.tar.lzma
+ <images config:type="list">
+ <image>
+ <name>GNOME [1]</name>
+ <type>tar</type>
+ <file>common-base-i386.tar.lzma</file>
+ </image>
+ <image>
+ <name>GNOME [2]</name>
+ <type>tar</type>
+ <file>common-xorg-i386.tar.lzma</file>
+ </image>
+ <image>
+ <name>GNOME [4]</name>
+ <type>tar</type>
+ <file>common-desktop-i386.tar.lzma</file>
+ </image>
+ <image>
+ <name>GNOME</name>
+ <type>tar</type>
+ <file>gnome-i386.tar.lzma</file>
+ </image>
+ <image>
+ <name>GNOME [meta]</name>
+ <type>tar</type>
+ <file>gnome-meta-i386.tar.lzma</file>
+ </image>
+ </images>
+
+
+ <patterns>base,enhanced_base,sw_management</patterns>
+ <archs>i386</archs>
+ base-meta-i386.tar.lzma
+ <images config:type="list">
+ <image>
+ <name>BASE [1]</name>
+ <type>tar</type>
+ <file>base-meta-i386.tar.lzma</file>
+ </image>
+ <image>
+ <name>BASE [2]</name>
+ <type>tar</type>
+ <file>base-i386.tar.lzma</file>
+ </image>
+ <image>
+ <name>BASE [3]</name>
+ <type>tar</type>
+ <file>common-base-i386.tar.lzma</file>
+ </image>
+ </images>
+
+
+ <patterns>base,enhanced_base,fonts,sw_management,x11</patterns>
+ <archs>i386</archs>
+ x11-meta-i386.tar.lzma
+ <images config:type="list">
+ <image>
+ <name>X11 [1]</name>
+ <type>tar</type>
+ <file>x11-meta-i386.tar.lzma</file>
+ </image>
+ <image>
+ <name>X11 [2]</name>
+ <type>tar</type>
+ <file>x11-i386.tar.lzma</file>
+ </image>
+ <image>
+ <name>X11 [3]</name>
+ <type>tar</type>
+ <file>common-xorg-i386.tar.lzma</file>
+ </image>
+ <image>
+ <name>X11 [4]</name>
+ <type>tar</type>
+ <file>common-base-i386.tar.lzma</file>
+ </image>
+ </images>
+
+
+ <patterns>base,enhanced_base,games,imaging,kde4,kde4_basis,multimedia,sw_management,x11,xgl</patterns>
+ <archs>x86_64</archs>
+ kde-meta-x86_64.tar.lzma
+ <images config:type="list">
+ <image>
+ <name>KDE [base]</name>
+ <type>tar</type>
+ <file>common-base-x86_64.tar.lzma</file>
+ </image>
+ <image>
+ <name>KDE [xorg]</name>
+ <type>tar</type>
+ <file>common-xorg-x86_64.tar.lzma</file>
+ </image>
+ <image>
+ <name>KDE [desktop]</name>
+ <type>tar</type>
+ <file>common-desktop-x86_64.tar.lzma</file>
+ </image>
+ <image>
+ <name>KDE</name>
+ <type>tar</type>
+ <file>kde-x86_64.tar.lzma</file>
+ </image>
+ <image>
+ <name>KDE [meta]</name>
+ <type>tar</type>
+ <file>kde-meta-x86_64.tar.lzma</file>
+ </image>
+ </images>
+
+
+ <patterns>base,enhanced_base,fonts,games,gnome,gnome_basis,imaging,multimedia,sw_management,x11,xgl</patterns>
+ <archs>x86_64</archs>
+ gnome-meta-x86_64.tar.lzma
+ <images config:type="list">
+ <image>
+ <name>GNOME [1]</name>
+ <type>tar</type>
+ <file>common-base-x86_64.tar.lzma</file>
+ </image>
+ <image>
+ <name>GNOME [2]</name>
+ <type>tar</type>
+ <file>common-xorg-x86_64.tar.lzma</file>
+ </image>
+ <image>
+ <name>GNOME [4]</name>
+ <type>tar</type>
+ <file>common-desktop-x86_64.tar.lzma</file>
+ </image>
+ <image>
+ <name>GNOME</name>
+ <type>tar</type>
+ <file>gnome-x86_64.tar.lzma</file>
+ </image>
+ <image>
+ <name>GNOME [meta]</name>
+ <type>tar</type>
+ <file>gnome-meta-x86_64.tar.lzma</file>
+ </image>
+ </images>
+
+
+ <patterns>base,enhanced_base,sw_management</patterns>
+ <archs>x86_64</archs>
+ base-meta-x86_64.tar.lzma
+ <images config:type="list">
+ <image>
+ <name>BASE [1]</name>
+ <type>tar</type>
+ <file>base-meta-x86_64.tar.lzma</file>
+ </image>
+ <image>
+ <name>BASE [2]</name>
+ <type>tar</type>
+ <file>base-x86_64.tar.lzma</file>
+ </image>
+ <image>
+ <name>BASE [3]</name>
+ <type>tar</type>
+ <file>common-base-x86_64.tar.lzma</file>
+ </image>
+ </images>
+
+
+ <patterns>base,enhanced_base,fonts,sw_management,x11</patterns>
+ <archs>x86_64</archs>
+ x11-meta-x86_64.tar.lzma
+ <images config:type="list">
+ <image>
+ <name>X11 [1]</name>
+ <type>tar</type>
+ <file>x11-meta-x86_64.tar.lzma</file>
+ </image>
+ <image>
+ <name>X11 [2]</name>
+ <type>tar</type>
+ <file>x11-x86_64.tar.lzma</file>
+ </image>
+ <image>
+ <name>X11 [3]</name>
+ <type>tar</type>
+ <file>common-xorg-x86_64.tar.lzma</file>
+ </image>
+ <image>
+ <name>X11 [4]</name>
+ <type>tar</type>
+ <file>common-base-x86_64.tar.lzma</file>
+ </image>
+ </images>
+
+
+ <patterns>base,enhanced_base,games,imaging,kde4,kde4_basis,multimedia,sw_management,x11,xgl</patterns>
+ <archs>ppc</archs>
+ kde-meta-ppc.tar.lzma
+ <images config:type="list">
+ <image>
+ <name>KDE [base]</name>
+ <type>tar</type>
+ <file>common-base-ppc.tar.lzma</file>
+ </image>
+ <image>
+ <name>KDE [xorg]</name>
+ <type>tar</type>
+ <file>common-xorg-ppc.tar.lzma</file>
+ </image>
+ <image>
+ <name>KDE [desktop]</name>
+ <type>tar</type>
+ <file>common-desktop-ppc.tar.lzma</file>
+ </image>
+ <image>
+ <name>KDE</name>
+ <type>tar</type>
+ <file>kde-ppc.tar.lzma</file>
+ </image>
+ <image>
+ <name>KDE [meta]</name>
+ <type>tar</type>
+ <file>kde-meta-ppc.tar.lzma</file>
+ </image>
+ </images>
+
+
+ <patterns>base,enhanced_base,fonts,games,gnome,gnome_basis,imaging,multimedia,sw_management,x11,xgl</patterns>
+ <archs>ppc</archs>
+ gnome-meta-ppc.tar.lzma
+ <images config:type="list">
+ <image>
+ <name>GNOME [1]</name>
+ <type>tar</type>
+ <file>common-base-ppc.tar.lzma</file>
+ </image>
+ <image>
+ <name>GNOME [2]</name>
+ <type>tar</type>
+ <file>common-xorg-ppc.tar.lzma</file>
+ </image>
+ <image>
+ <name>GNOME [4]</name>
+ <type>tar</type>
+ <file>common-desktop-ppc.tar.lzma</file>
+ </image>
+ <image>
+ <name>GNOME</name>
+ <type>tar</type>
+ <file>gnome-ppc.tar.lzma</file>
+ </image>
+ <image>
+ <name>GNOME [meta]</name>
+ <type>tar</type>
+ <file>gnome-meta-ppc.tar.lzma</file>
+ </image>
+ </images>
+
+
+ <patterns>base,enhanced_base,sw_management</patterns>
+ <archs>ppc</archs>
+ base-meta-ppc.tar.lzma
+ <images config:type="list">
+ <image>
+ <name>BASE [1]</name>
+ <type>tar</type>
+ <file>base-meta-ppc.tar.lzma</file>
+ </image>
+ <image>
+ <name>BASE [2]</name>
+ <type>tar</type>
+ <file>base-ppc.tar.lzma</file>
+ </image>
+ <image>
+ <name>BASE [3]</name>
+ <type>tar</type>
+ <file>common-base-ppc.tar.lzma</file>
+ </image>
+ </images>
+
+
+ <patterns>base,enhanced_base,fonts,sw_management,x11</patterns>
+ <archs>ppc</archs>
+ x11-meta-ppc.tar.lzma
+ <images config:type="list">
+ <image>
+ <name>X11 [1]</name>
+ <type>tar</type>
+ <file>x11-meta-ppc.tar.lzma</file>
+ </image>
+ <image>
+ <name>X11 [2]</name>
+ <type>tar</type>
+ <file>x11-ppc.tar.lzma</file>
+ </image>
+ <image>
+ <name>X11 [3]</name>
+ <type>tar</type>
+ <file>common-xorg-ppc.tar.lzma</file>
+ </image>
+ <image>
+ <name>X11 [4]</name>
+ <type>tar</type>
+ <file>common-base-ppc.tar.lzma</file>
+ </image>
+ </images>
+
+
+
Added: trunk/libzypp/tests/zypp/data/Fetcher/remote-site/images-file/content
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/remote-site/images-file/content?rev=11598&view=auto
==============================================================================
--- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/images-file/content (added)
+++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/images-file/content Thu Nov 6 16:55:44 2008
@@ -0,0 +1,143 @@
+CONTENTSTYLE 11
+BASEARCHS i586
+DATADIR suse
+DESCRDIR suse/setup/descr
+DISTRIBUTION openSUSE
+FLAVOR dvd
+LABEL openSUSE 11.1
+LINGUAS cs da de en en_GB en_US es fi fr hu it ja nb nl pl pt pt_BR ru sv zh zh_CN zh_TW
+NAME openSUSE
+REFERENCES openSUSE-release = 11.1
+RELNOTESURL http://www.suse.com/relnotes/i386/openSUSE/11.0.42/release-notes-openSUSE.rp...
+SUMMARY openSUSE
+VERSION 11.1
+META SHA1 dd627cf38a5dee28421690d2ec6abea7af274a50 dvd-11.1-58.1.i586.pat.gz
+META SHA1 fa49e3205fea8f95d395710a4ba79f55b4626ccd non_oss-11.1-58.1.i586.pat.gz
+META SHA1 f6c6ef681aa5fc4c5e9532f04420d54fbec033a8 packages.cs.gz
+META SHA1 cc5438a74d1b39f34bc31fbc2399ae6a95f43bc4 packages.de.gz
+META SHA1 90dfa1e81f5515769f5b16fcf31c1ab63c55ff87 packages.DU.gz
+META SHA1 b1c6b77703357297ecdd8d74b89a099ebbfe2fe6 packages.en.gz
+META SHA1 b137fc7749531183b5250ec907d4b9adf4624288 packages.es.gz
+META SHA1 3e55d6d5c21a6a1457ea6fef09c999b28883ade4 packages.fr.gz
+META SHA1 b5b6092d57a701d4052ad2bb047636c68ac31d8b packages.gz
+META SHA1 a893937892aeff71da1c38aa06f3cce5ba02de1c packages.hu.gz
+META SHA1 f6c6ef681aa5fc4c5e9532f04420d54fbec033a8 packages.sk.gz
+META SHA1 1d66972a977913541c7cb7130d61ec0e751148ba patterns
+HASH SHA1 4ae30edd0588114b642bbb08fbd3fb71d7af257d license.tar.gz
+HASH SHA1 67d82aa5cd4f08cf77cc70fe9ca1834a4b6212cc control.xml
+HASH SHA1 e727c621ded4324cc61e94c615dbd423436f63e4 media.1/info.txt
+HASH SHA1 7442eb13ca3c184fe0d47060dbc56fd45cfcb720 boot/i386/bind
+HASH SHA1 99920bc0c322d0d0b63ac361d2f9c8f6bc9e3524 boot/i386/branding
+HASH SHA1 ca2f0bce909d73d1bfaa7cdeb98595f17e4524aa boot/i386/common
+HASH SHA1 d107fa19616c3eae9d49fe52e54971e5b9c160fa boot/i386/config
+HASH SHA1 4b7d8525b1d3588562bea71b26cdb5e48e29ff64 boot/i386/cracklib-dict-full.rpm
+HASH SHA1 1a8151b2bf88cf618be74eee60d65063386469e0 boot/i386/fonts-arabic.rpm
+HASH SHA1 79aec7c93b730c2355aebd085eddf4195a9c1d36 boot/i386/fonts-thai.rpm
+HASH SHA1 52e1040f8e0fae373d7426447b1f9d05d25b90f6 boot/i386/gdb
+HASH SHA1 a1ba35bcecde55eb36be2e89b7210998b846be9d boot/i386/indic-fonts.rpm
+HASH SHA1 6394ec4eb1883520de23bd2ac043490da6ed8fde boot/i386/initrd-xen
+HASH SHA1 6394ec4eb1883520de23bd2ac043490da6ed8fde boot/i386/initrd-xenpae
+HASH SHA1 6cebf392eaf1b17b53f3e5e88a6b6c6d8c2b76bb boot/i386/KhmerOS-fonts.rpm
+HASH SHA1 e9c779539f1b3f56a96337f262b2bc548e6b223e boot/i386/LIESMICH
+HASH SHA1 abdf17a0246be709efbcc7c0e0a68f8ad797a754 boot/i386/LIESMICH.DOS
+HASH SHA1 f51e15897e5f77c7a7b4d1600dc53be6f117d9ec boot/i386/lklug.rpm
+HASH SHA1 c4dca65aa97554bc45885b22ef4af24ad5177c75 boot/i386/mkbootdisk
+HASH SHA1 99920bc0c322d0d0b63ac361d2f9c8f6bc9e3524 boot/i386/openSUSE
+HASH SHA1 ae44557c57285f0866be41334fdaa20312ccdeab boot/i386/README
+HASH SHA1 4a71ee6114eccfb88582dc5422020cbc5a2639dd boot/i386/README.DOS
+HASH SHA1 e12efd095a7fb990d0c4be1e04999e72de84dd6a boot/i386/rescue
+HASH SHA1 73e50e6321e6938471c4fc0521e0b2dce54f0346 boot/i386/root
+HASH SHA1 9b4cced8b700c6737ab02af8f1521945c925c8f9 boot/i386/rpmlist
+HASH SHA1 2181540518e50f88e7e35c619460e746934eacd4 boot/i386/sax2
+HASH SHA1 78d3ee95682c1150aa8a95132ba1c5d0d88c23bd boot/i386/ttf-arphic-uming.rpm
+HASH SHA1 55a2d437b32d6c192c60e016756725f7a2e717e9 boot/i386/unfonts.rpm
+HASH SHA1 7c6fbdc97c11e5e03098f19c196d85cd63e5ce85 boot/i386/vmlinuz-xen
+HASH SHA1 7c6fbdc97c11e5e03098f19c196d85cd63e5ce85 boot/i386/vmlinuz-xenpae
+HASH SHA1 67d109ba80c3f396710774ff03ace955a2184dc6 boot/i386/yast2-trans-af.rpm
+HASH SHA1 3d835ea74b409914cf40ba48669a11590cffa902 boot/i386/yast2-trans-ar.rpm
+HASH SHA1 5654cabb329f0b1251d5743624fdf599b92d71e5 boot/i386/yast2-trans-bg.rpm
+HASH SHA1 1015f485542ae7c903ec9d1a9c7983d4701e2824 boot/i386/yast2-trans-bn.rpm
+HASH SHA1 454e0f1b79d2076a9ba03b23c34da3cbc3e58e25 boot/i386/yast2-trans-bs.rpm
+HASH SHA1 76bbfdb77952db51e9b21dc90ab167f2a46f4580 boot/i386/yast2-trans-ca.rpm
+HASH SHA1 59f26af0b058b47f2d821f6fa8102d58af8d0377 boot/i386/yast2-trans-cs.rpm
+HASH SHA1 db43e4829de2a26b4bb09aa1e93069af2b230377 boot/i386/yast2-trans-cy.rpm
+HASH SHA1 1aee13cb0b0a1f4e7b1bbb49e809fd13919ba7e9 boot/i386/yast2-trans-da.rpm
+HASH SHA1 36335f1ff2738071be00be65a64f7d41b7db1c33 boot/i386/yast2-trans-de.rpm
+HASH SHA1 5297e40871de03217cfee404cb88e909422ceae8 boot/i386/yast2-trans-el.rpm
+HASH SHA1 bc61efbd85302ed96ae51550a163cd0fc9ad59a3 boot/i386/yast2-trans-en_GB.rpm
+HASH SHA1 a237b73e48777fcdd42505ec1e007484d9f398da boot/i386/yast2-trans-en_US.rpm
+HASH SHA1 f2e0dba8e86a723ab72d7f7490665f8e631f63a1 boot/i386/yast2-trans-es.rpm
+HASH SHA1 ca9bd8bf05434d42b6a7c2c7549e2ce0170c6be8 boot/i386/yast2-trans-et.rpm
+HASH SHA1 57e5cd63079ac258734f28df5385e5288cd59db0 boot/i386/yast2-trans-fa.rpm
+HASH SHA1 2983eb7ba93882e52434f396b49cd6e98d7b7399 boot/i386/yast2-trans-fi.rpm
+HASH SHA1 0dfc3b38294524871f527d919ce31d6921cf77c0 boot/i386/yast2-trans-fr.rpm
+HASH SHA1 2051d343881b288c5d22aec792e9d13ec192dfd1 boot/i386/yast2-trans-gl.rpm
+HASH SHA1 49736a9798a371c3edf02f350ebe4db1e6fff011 boot/i386/yast2-trans-gu.rpm
+HASH SHA1 d9737ea270e5166cbc409466c1d2a6f16fcc9f06 boot/i386/yast2-trans-hi.rpm
+HASH SHA1 1e222655cfabbf0212e629ed1fccf304847ac732 boot/i386/yast2-trans-hr.rpm
+HASH SHA1 1b6e646f9f8abc7c33ef2dd830b72c7a2f775620 boot/i386/yast2-trans-hu.rpm
+HASH SHA1 723a18301396eccf7c0620f1f8f016719eaf7543 boot/i386/yast2-trans-id.rpm
+HASH SHA1 70c272dbe7bfe963e44e5331edd5f440450bc827 boot/i386/yast2-trans-it.rpm
+HASH SHA1 f17bc3588c7d2878821600d42fe174156971f87e boot/i386/yast2-trans-ja.rpm
+HASH SHA1 d46ea44b7d98ade64658d1cf388013093d1c0d39 boot/i386/yast2-trans-jv.rpm
+HASH SHA1 e4e684ebb7f93ac20461062544b49fe18c88627d boot/i386/yast2-trans-ka.rpm
+HASH SHA1 123eb83403b88845cb5efd9046ef39351c1b68c3 boot/i386/yast2-trans-km.rpm
+HASH SHA1 85c28913c4432f43fa29d8791d97b3e10456a42a boot/i386/yast2-trans-ko.rpm
+HASH SHA1 6692fca0c1acb85b398bcbb9150d0826ea38f2c8 boot/i386/yast2-trans-lo.rpm
+HASH SHA1 6247198d1348d31192dc158969ce8ae9252d6f0b boot/i386/yast2-trans-lt.rpm
+HASH SHA1 a630f16e50a6227f814751931bb1a1ec15981c29 boot/i386/yast2-trans-mk.rpm
+HASH SHA1 4f0bffd5cbeb7d37a7d78f1996cade7ae2ad2420 boot/i386/yast2-trans-mr.rpm
+HASH SHA1 bbc950f9fec446e9a5a5876c532cd56e060c5eb4 boot/i386/yast2-trans-nb.rpm
+HASH SHA1 edae4d58bd99064bbddd62278875b0387a2d495d boot/i386/yast2-trans-nl.rpm
+HASH SHA1 85f1dc1eef8862066050c09eef023705a5d61039 boot/i386/yast2-trans-pa.rpm
+HASH SHA1 e1eb02ebedff18a01facc150e00d05385affaa17 boot/i386/yast2-trans-pl.rpm
+HASH SHA1 c3d31be5bf8af62c537e1a70db9afc98842b3f82 boot/i386/yast2-trans-pt_BR.rpm
+HASH SHA1 b2bcd427139f2e13684a592ff186c3076a5b22d8 boot/i386/yast2-trans-pt.rpm
+HASH SHA1 7fdb3299ca8230ec363d3ee8eee24915c931790c boot/i386/yast2-trans-ro.rpm
+HASH SHA1 8b9bdb13f3b7c73e8c64303e8614e44bf640cc9f boot/i386/yast2-trans-ru.rpm
+HASH SHA1 55876ae86c10a3504bbbcd71e49564f4c0b47149 boot/i386/yast2-trans-si.rpm
+HASH SHA1 ee8ce4bc8a06b5094f8d51c79b32806531203d62 boot/i386/yast2-trans-sk.rpm
+HASH SHA1 04130a176a24ce3adb663a2bb694fd484f2a7776 boot/i386/yast2-trans-sl.rpm
+HASH SHA1 d3408d472a956ffbd1fb49354057da5c0b77879f boot/i386/yast2-trans-sr.rpm
+HASH SHA1 fda2c586ff8a17d402108f007c2c6214bcaeca3f boot/i386/yast2-trans-sv.rpm
+HASH SHA1 04021fd6654b2e7b6cbff65c094efa8c35424215 boot/i386/yast2-trans-ta.rpm
+HASH SHA1 6aaae1e49e3188b5e73bedb3c3cd044c4108cca2 boot/i386/yast2-trans-th.rpm
+HASH SHA1 6bb5903b7bc64185352c616099c344f8738bb768 boot/i386/yast2-trans-tr.rpm
+HASH SHA1 9f631f117433db5e44a6bbed7c8a50cbbe5e8ac0 boot/i386/yast2-trans-uk.rpm
+HASH SHA1 3ba5a8f4f3dc3f454e13223c2ecef9937824a611 boot/i386/yast2-trans-vi.rpm
+HASH SHA1 bc2775d3a4a0a3ca80e5a5caa51a6612e7158d32 boot/i386/yast2-trans-wa.rpm
+HASH SHA1 a3511637ca9bd4cbf5dc9eca58f8ccf5df49603c boot/i386/yast2-trans-xh.rpm
+HASH SHA1 ba8875e4c0febe1d26d27c0c948e93128f14476a boot/i386/yast2-trans-zh_CN.rpm
+HASH SHA1 d39b329ce32a0d59bebecd0d87ecfd59cb26e297 boot/i386/yast2-trans-zh_TW.rpm
+HASH SHA1 0c6f45e6b01d531ac7e821ae9e479416149e92eb boot/i386/yast2-trans-zu.rpm
+HASH SHA1 2325eb886cf06b58ca1892578383b5fcc5b11866 boot/i386/loader/linux
+HASH SHA1 586ec9beb26fb337283f3b49149d843a3fb7c821 boot/i386/loader/initrd
+HASH SHA1 d6b4db657272efe902f8ce92b53082fda4d5f1ca boot/i386/loader/08000600.spl
+HASH SHA1 22d4aeede74fdf44b3c4a2524319fe9cf418d4c6 boot/i386/loader/10240600.spl
+HASH SHA1 93e297fb9ffa23d6a167c50c318bbb46b0705e45 boot/i386/loader/10240768.spl
+HASH SHA1 8c135621ac91216c3388f9ea9c02127b2f6375a0 boot/i386/loader/12800800.spl
+HASH SHA1 54dd2bc17c9f73ad9d6a85489f99f518849cb84d boot/i386/loader/12801024.spl
+HASH SHA1 ef0f517a3f3a3240349b9bdd01e794267372c4ab boot/i386/loader/14001050.spl
+HASH SHA1 2abbc5b4c7c3dc8134ae1207f9d9e95a640046ef boot/i386/loader/16001200.spl
+HASH SHA1 e37862355648f6330b6831c69c989dec02b80ab0 boot/i386/loader/16801050.spl
+HASH SHA1 082a7887d2f43d049fdb0fc92c5051f1a5b7e663 boot/i386/loader/19201200.spl
+HASH SHA1 ed5f4a87074367bcf8396da7a9b9b3d1be6dfcb2 images/base-i386.tar.lzma
+HASH SHA1 9d055cacc983226171cdd3a3fe1acd6bb6fa044e images/base-meta-i386.tar.lzma
+HASH SHA1 361e07c44526cd43a2d477b7b3448e49e674f0a8 images/common-base-i386.tar.lzma
+HASH SHA1 6854608038e4d3b11fcc950e28ca49e4582fd2a4 images/common-desktop-i386.tar.lzma
+HASH SHA1 5f6a43158c017e188309c094cdaf24c346de3dfb images/common-xorg-i386.tar.lzma
+HASH SHA1 ce6620b820e494c042398b9fd7ed108578008168 images/details-i386.xml
+HASH SHA1 22c466bf9af3003ee95fed6f7fb93b4c8c0cd993 images/gnome-i386.tar.lzma
+HASH SHA1 49374551f38fe919cf4545d5af0fea7d45361738 images/gnome-meta-i386.tar.lzma
+HASH SHA1 d1e9a38629e353d1f0136ded670cf28213d47e6f images/images.xml
+HASH SHA1 0df7debf780a0e01b18004d18ef6ab21410b9480 images/kde-i386.tar.lzma
+HASH SHA1 c418a15669de278e523893f030c209c479f490e6 images/kde-meta-i386.tar.lzma
+HASH SHA1 6c4238796684f770a0b4ecd1ea4469e5a7a49b0d images/x11-i386.tar.lzma
+HASH SHA1 cc50a8bc9d560c8d522660feed5feb019f9b889e images/x11-meta-i386.tar.lzma
+KEY SHA1 17162a96933229a9771ee10c0976bdc047a2f53d gpg-pubkey-0dfb3188-41ed929b.asc
+KEY SHA1 f6accbb18d705bfc104c893cf7dfca1247a33f3c gpg-pubkey-307e3d54-481f30aa.asc
+KEY SHA1 47f6492d127ae9f6aac353a2dd23752fc0ed4f8d gpg-pubkey-3d25d3d9-36e12d04.asc
+KEY SHA1 2288e5849740566e4fb65b7c9dc0c7e4f43b1039 gpg-pubkey-56b4177a-47965b33.asc
+KEY SHA1 89d4bcd20a281553fd1d4ec1708603ebf88f1a59 gpg-pubkey-7e2e3b05-4816488f.asc
+KEY SHA1 06ff5171362496c0db84beeccd29967f580350b2 gpg-pubkey-9c800aca-481f343a.asc
+KEY SHA1 04544096c5c3b0ed7b01a83d79e048307c2af919 gpg-pubkey-a1912208-446a0899.asc
Added: trunk/libzypp/tests/zypp/data/Fetcher/remote-site/images-file/content.asc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/remote-site/images-file/content.asc?rev=11598&view=auto
==============================================================================
--- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/images-file/content.asc (added)
+++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/images-file/content.asc Thu Nov 6 16:55:44 2008
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEABECAAYFAkkTDKoACgkQm+zCtd2wN1bWFwCcDMWfuN+JDv8/Dew9ozDLNkNM
+JbAAn2nqGLhU1PcX6Ev4t/jlPsazliaC
+=8Ava
+-----END PGP SIGNATURE-----
Added: trunk/libzypp/tests/zypp/data/Fetcher/remote-site/images-file/content.key
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/remote-site/images-file/content.key?rev=11598&view=auto
==============================================================================
--- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/images-file/content.key (added)
+++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/images-file/content.key Thu Nov 6 16:55:44 2008
@@ -0,0 +1,49 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+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
+aVStjbDRYEnTHQOGsVy9
+=ZZx0
+-----END PGP PUBLIC KEY BLOCK-----
Added: trunk/libzypp/tests/zypp/data/Fetcher/remote-site/images-file/images/images.xml
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/remote-site/images-file/images/images.xml?rev=11598&view=auto
==============================================================================
--- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/images-file/images/images.xml (added)
+++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/images-file/images/images.xml Thu Nov 6 16:55:44 2008
@@ -0,0 +1,345 @@
+<?xml version="1.0"?>
+<!DOCTYPE images>
+http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns">
+
+
+ <patterns>base,enhanced_base,games,imaging,kde4,kde4_basis,multimedia,sw_management,x11,xgl</patterns>
+ <archs>i386</archs>
+ kde-meta-i386.tar.lzma
+ <images config:type="list">
+ <image>
+ <name>KDE [base]</name>
+ <type>tar</type>
+ <file>common-base-i386.tar.lzma</file>
+ </image>
+ <image>
+ <name>KDE [xorg]</name>
+ <type>tar</type>
+ <file>common-xorg-i386.tar.lzma</file>
+ </image>
+ <image>
+ <name>KDE [desktop]</name>
+ <type>tar</type>
+ <file>common-desktop-i386.tar.lzma</file>
+ </image>
+ <image>
+ <name>KDE</name>
+ <type>tar</type>
+ <file>kde-i386.tar.lzma</file>
+ </image>
+ <image>
+ <name>KDE [meta]</name>
+ <type>tar</type>
+ <file>kde-meta-i386.tar.lzma</file>
+ </image>
+ </images>
+
+
+ <patterns>base,enhanced_base,fonts,games,gnome,gnome_basis,imaging,multimedia,sw_management,x11,xgl</patterns>
+ <archs>i386</archs>
+ gnome-meta-i386.tar.lzma
+ <images config:type="list">
+ <image>
+ <name>GNOME [1]</name>
+ <type>tar</type>
+ <file>common-base-i386.tar.lzma</file>
+ </image>
+ <image>
+ <name>GNOME [2]</name>
+ <type>tar</type>
+ <file>common-xorg-i386.tar.lzma</file>
+ </image>
+ <image>
+ <name>GNOME [4]</name>
+ <type>tar</type>
+ <file>common-desktop-i386.tar.lzma</file>
+ </image>
+ <image>
+ <name>GNOME</name>
+ <type>tar</type>
+ <file>gnome-i386.tar.lzma</file>
+ </image>
+ <image>
+ <name>GNOME [meta]</name>
+ <type>tar</type>
+ <file>gnome-meta-i386.tar.lzma</file>
+ </image>
+ </images>
+
+
+ <patterns>base,enhanced_base,sw_management</patterns>
+ <archs>i386</archs>
+ base-meta-i386.tar.lzma
+ <images config:type="list">
+ <image>
+ <name>BASE [1]</name>
+ <type>tar</type>
+ <file>base-meta-i386.tar.lzma</file>
+ </image>
+ <image>
+ <name>BASE [2]</name>
+ <type>tar</type>
+ <file>base-i386.tar.lzma</file>
+ </image>
+ <image>
+ <name>BASE [3]</name>
+ <type>tar</type>
+ <file>common-base-i386.tar.lzma</file>
+ </image>
+ </images>
+
+
+ <patterns>base,enhanced_base,fonts,sw_management,x11</patterns>
+ <archs>i386</archs>
+ x11-meta-i386.tar.lzma
+ <images config:type="list">
+ <image>
+ <name>X11 [1]</name>
+ <type>tar</type>
+ <file>x11-meta-i386.tar.lzma</file>
+ </image>
+ <image>
+ <name>X11 [2]</name>
+ <type>tar</type>
+ <file>x11-i386.tar.lzma</file>
+ </image>
+ <image>
+ <name>X11 [3]</name>
+ <type>tar</type>
+ <file>common-xorg-i386.tar.lzma</file>
+ </image>
+ <image>
+ <name>X11 [4]</name>
+ <type>tar</type>
+ <file>common-base-i386.tar.lzma</file>
+ </image>
+ </images>
+
+
+ <patterns>base,enhanced_base,games,imaging,kde4,kde4_basis,multimedia,sw_management,x11,xgl</patterns>
+ <archs>x86_64</archs>
+ kde-meta-x86_64.tar.lzma
+ <images config:type="list">
+ <image>
+ <name>KDE [base]</name>
+ <type>tar</type>
+ <file>common-base-x86_64.tar.lzma</file>
+ </image>
+ <image>
+ <name>KDE [xorg]</name>
+ <type>tar</type>
+ <file>common-xorg-x86_64.tar.lzma</file>
+ </image>
+ <image>
+ <name>KDE [desktop]</name>
+ <type>tar</type>
+ <file>common-desktop-x86_64.tar.lzma</file>
+ </image>
+ <image>
+ <name>KDE</name>
+ <type>tar</type>
+ <file>kde-x86_64.tar.lzma</file>
+ </image>
+ <image>
+ <name>KDE [meta]</name>
+ <type>tar</type>
+ <file>kde-meta-x86_64.tar.lzma</file>
+ </image>
+ </images>
+
+
+ <patterns>base,enhanced_base,fonts,games,gnome,gnome_basis,imaging,multimedia,sw_management,x11,xgl</patterns>
+ <archs>x86_64</archs>
+ gnome-meta-x86_64.tar.lzma
+ <images config:type="list">
+ <image>
+ <name>GNOME [1]</name>
+ <type>tar</type>
+ <file>common-base-x86_64.tar.lzma</file>
+ </image>
+ <image>
+ <name>GNOME [2]</name>
+ <type>tar</type>
+ <file>common-xorg-x86_64.tar.lzma</file>
+ </image>
+ <image>
+ <name>GNOME [4]</name>
+ <type>tar</type>
+ <file>common-desktop-x86_64.tar.lzma</file>
+ </image>
+ <image>
+ <name>GNOME</name>
+ <type>tar</type>
+ <file>gnome-x86_64.tar.lzma</file>
+ </image>
+ <image>
+ <name>GNOME [meta]</name>
+ <type>tar</type>
+ <file>gnome-meta-x86_64.tar.lzma</file>
+ </image>
+ </images>
+
+
+ <patterns>base,enhanced_base,sw_management</patterns>
+ <archs>x86_64</archs>
+ base-meta-x86_64.tar.lzma
+ <images config:type="list">
+ <image>
+ <name>BASE [1]</name>
+ <type>tar</type>
+ <file>base-meta-x86_64.tar.lzma</file>
+ </image>
+ <image>
+ <name>BASE [2]</name>
+ <type>tar</type>
+ <file>base-x86_64.tar.lzma</file>
+ </image>
+ <image>
+ <name>BASE [3]</name>
+ <type>tar</type>
+ <file>common-base-x86_64.tar.lzma</file>
+ </image>
+ </images>
+
+
+ <patterns>base,enhanced_base,fonts,sw_management,x11</patterns>
+ <archs>x86_64</archs>
+ x11-meta-x86_64.tar.lzma
+ <images config:type="list">
+ <image>
+ <name>X11 [1]</name>
+ <type>tar</type>
+ <file>x11-meta-x86_64.tar.lzma</file>
+ </image>
+ <image>
+ <name>X11 [2]</name>
+ <type>tar</type>
+ <file>x11-x86_64.tar.lzma</file>
+ </image>
+ <image>
+ <name>X11 [3]</name>
+ <type>tar</type>
+ <file>common-xorg-x86_64.tar.lzma</file>
+ </image>
+ <image>
+ <name>X11 [4]</name>
+ <type>tar</type>
+ <file>common-base-x86_64.tar.lzma</file>
+ </image>
+ </images>
+
+
+ <patterns>base,enhanced_base,games,imaging,kde4,kde4_basis,multimedia,sw_management,x11,xgl</patterns>
+ <archs>ppc</archs>
+ kde-meta-ppc.tar.lzma
+ <images config:type="list">
+ <image>
+ <name>KDE [base]</name>
+ <type>tar</type>
+ <file>common-base-ppc.tar.lzma</file>
+ </image>
+ <image>
+ <name>KDE [xorg]</name>
+ <type>tar</type>
+ <file>common-xorg-ppc.tar.lzma</file>
+ </image>
+ <image>
+ <name>KDE [desktop]</name>
+ <type>tar</type>
+ <file>common-desktop-ppc.tar.lzma</file>
+ </image>
+ <image>
+ <name>KDE</name>
+ <type>tar</type>
+ <file>kde-ppc.tar.lzma</file>
+ </image>
+ <image>
+ <name>KDE [meta]</name>
+ <type>tar</type>
+ <file>kde-meta-ppc.tar.lzma</file>
+ </image>
+ </images>
+
+
+ <patterns>base,enhanced_base,fonts,games,gnome,gnome_basis,imaging,multimedia,sw_management,x11,xgl</patterns>
+ <archs>ppc</archs>
+ gnome-meta-ppc.tar.lzma
+ <images config:type="list">
+ <image>
+ <name>GNOME [1]</name>
+ <type>tar</type>
+ <file>common-base-ppc.tar.lzma</file>
+ </image>
+ <image>
+ <name>GNOME [2]</name>
+ <type>tar</type>
+ <file>common-xorg-ppc.tar.lzma</file>
+ </image>
+ <image>
+ <name>GNOME [4]</name>
+ <type>tar</type>
+ <file>common-desktop-ppc.tar.lzma</file>
+ </image>
+ <image>
+ <name>GNOME</name>
+ <type>tar</type>
+ <file>gnome-ppc.tar.lzma</file>
+ </image>
+ <image>
+ <name>GNOME [meta]</name>
+ <type>tar</type>
+ <file>gnome-meta-ppc.tar.lzma</file>
+ </image>
+ </images>
+
+
+ <patterns>base,enhanced_base,sw_management</patterns>
+ <archs>ppc</archs>
+ base-meta-ppc.tar.lzma
+ <images config:type="list">
+ <image>
+ <name>BASE [1]</name>
+ <type>tar</type>
+ <file>base-meta-ppc.tar.lzma</file>
+ </image>
+ <image>
+ <name>BASE [2]</name>
+ <type>tar</type>
+ <file>base-ppc.tar.lzma</file>
+ </image>
+ <image>
+ <name>BASE [3]</name>
+ <type>tar</type>
+ <file>common-base-ppc.tar.lzma</file>
+ </image>
+ </images>
+
+
+ <patterns>base,enhanced_base,fonts,sw_management,x11</patterns>
+ <archs>ppc</archs>
+ x11-meta-ppc.tar.lzma
+ <images config:type="list">
+ <image>
+ <name>X11 [1]</name>
+ <type>tar</type>
+ <file>x11-meta-ppc.tar.lzma</file>
+ </image>
+ <image>
+ <name>X11 [2]</name>
+ <type>tar</type>
+ <file>x11-ppc.tar.lzma</file>
+ </image>
+ <image>
+ <name>X11 [3]</name>
+ <type>tar</type>
+ <file>common-xorg-ppc.tar.lzma</file>
+ </image>
+ <image>
+ <name>X11 [4]</name>
+ <type>tar</type>
+ <file>common-base-ppc.tar.lzma</file>
+ </image>
+ </images>
+
+
+
Modified: trunk/libzypp/zypp/Fetcher.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Fetcher.cc?rev=11598&r1=11597&r2=11598&view=diff
==============================================================================
--- trunk/libzypp/zypp/Fetcher.cc (original)
+++ trunk/libzypp/zypp/Fetcher.cc Thu Nov 6 16:55:44 2008
@@ -551,7 +551,16 @@
{
ZYPP_CAUGHT(excpt_r);
excpt_r.remember("Can't provide " + resource.filename().asString() + " : " + excpt_r.msg());
- ZYPP_RETHROW(excpt_r);
+
+ if ( resource.optional() )
+ {
+ WAR << "optional resource " << resource << " could not be transfered" << endl;
+ return;
+ }
+ else
+ {
+ ZYPP_RETHROW(excpt_r);
+ }
}
}
else
@@ -653,7 +662,9 @@
fetcher.enqueue(sigloc);
fetcher.start( dest_dir, media );
// if we get the signature, update the checker
- sigchecker = SignatureFileChecker(dest_dir + sigloc.filename());
+ if ( PathInfo(dest_dir + sigloc.filename()).isExist() )
+ sigchecker = SignatureFileChecker(dest_dir + sigloc.filename());
+
fetcher.reset();
// now the key
@@ -744,6 +755,11 @@
provideToDest(media, (*it_res)->location, dest_dir);
+ // if the file was not transfered, and no exception, just
+ // return, as it was an optional file
+ if ( ! PathInfo(dest_dir + (*it_res)->location.filename()).isExist() )
+ return;
+
// if the checksum is empty, but the checksum is in one of the
// indexes checksum, then add a checker
if ( (*it_res)->location.checksum().empty() )
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org