October 2008 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r11535 - /trunk/libzypp/zypp/media/MediaCurl.cc
by jkupec＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: jkupec Date: Wed Oct 29 14:13:32 2008 New Revision: 11535 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11535&view=rev Log: - throw a MediaTimeoutException also on http 504 (gateway timeout) (bnc #425035) Modified: trunk/libzypp/zypp/media/MediaCurl.cc Modified: trunk/libzypp/zypp/media/MediaCurl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/media/MediaCurl.cc?… ============================================================================== --- trunk/libzypp/zypp/media/MediaCurl.cc (original) +++ trunk/libzypp/zypp/media/MediaCurl.cc Wed Oct 29 14:13:32 2008 @@ -492,7 +492,7 @@ disconnectFrom(); ZYPP_THROW(MediaCurlSetOptException(_url, _curlError)); } - + } @@ -1058,6 +1058,11 @@ )); } else + if (httpReturnCode == 504) // gateway timeout + { + ZYPP_THROW(MediaTimeoutException(url)); + } + else if ( httpReturnCode == 403) // access denied { ZYPP_THROW(MediaForbiddenException(url)); @@ -1282,6 +1287,11 @@ )); } else + if (httpReturnCode == 504) // gateway timeout + { + ZYPP_THROW(MediaTimeoutException(url)); + } + else if ( httpReturnCode == 403) { ZYPP_THROW(MediaForbiddenException(url)); @@ -1662,7 +1672,7 @@ string prompt_msg = boost::str(boost::format( //!\todo add comma to the message for the next release - _("Authentication required for '%s'")) % _url.asString()); + _("Authentication required for '%s'")) % _url.asString()); // set available authentication types from the exception // might be needed in prompt @@ -1684,7 +1694,7 @@ * back to repoinfo or dont store urls with username * (and either forbid more repos with the same url and different * user, or return a set of credentials from CM and try them one - * by one) + * by one) */ } } -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r11534 - in /trunk/libzypp: package/libzypp.changes zypp/Arch.cc zypp/Arch.h
by mlandres＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: mlandres Date: Wed Oct 29 12:52:44 2008 New Revision: 11534 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11534&view=rev Log: - Add "sh4" architectures. Modified: trunk/libzypp/package/libzypp.changes trunk/libzypp/zypp/Arch.cc trunk/libzypp/zypp/Arch.h Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?… ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Wed Oct 29 12:52:44 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Oct 29 12:51:55 CET 2008 - ma(a)suse.de + +- Add 'sh4' architectures. +- revision 11534 + +------------------------------------------------------------------- Tue Oct 28 22:01:40 CET 2008 - dmacvicar(a)suse.de - don't free the header before curl_perform as curl does not Modified: trunk/libzypp/zypp/Arch.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Arch.cc?rev=11534&r… ============================================================================== --- trunk/libzypp/zypp/Arch.cc (original) +++ trunk/libzypp/zypp/Arch.cc Wed Oct 29 12:52:44 2008 @@ -136,7 +136,12 @@ { ///////////////////////////////////////////////////////////////// // builtin architecture STRING VALUES -#define DEF_BUILTIN(A) const IdString _##A( #A ) + // + // For arch 'foo' this macro defines: + // const IdString _foo( "foo" ); // to be used in defCompatibleWith below! + // const Arch Arch_foo( _foo ); + // +#define DEF_BUILTIN(A) const IdString _##A( #A ); const Arch Arch_##A( _##A ) DEF_BUILTIN( noarch ); DEF_BUILTIN( i386 ); @@ -176,6 +181,11 @@ DEF_BUILTIN( armv4tl ); DEF_BUILTIN( armv4l ); DEF_BUILTIN( armv3l ); + + DEF_BUILTIN( sh3 ); + + DEF_BUILTIN( sh4 ); + DEF_BUILTIN( sh4a ); #undef DEF_BUILTIN /////////////////////////////////////////////////////////////////// @@ -271,7 +281,7 @@ // defCompatibleWith( _sparcv9, _noarch,_sparc ); defCompatibleWith( _sparc64, _noarch,_sparc,_sparcv9 ); - + // defCompatibleWith( _armv3l, _noarch ); defCompatibleWith( _armv4l, _noarch,_armv3l ); defCompatibleWith( _armv4tl, _noarch,_armv3l,_armv4l ); @@ -280,6 +290,11 @@ defCompatibleWith( _armv5tejl, _noarch,_armv3l,_armv4l,_armv4tl,_armv5l,_armv5tel ); defCompatibleWith( _armv6l, _noarch,_armv3l,_armv4l,_armv4tl,_armv5l,_armv5tel,_armv5tejl ); // + defCompatibleWith( _sh3, _noarch ); + // + defCompatibleWith( _sh4, _noarch ); + defCompatibleWith( _sh4a, _noarch,_sh4 ); + // /////////////////////////////////////////////////////////////////// //dumpOn( USR ) << endl; } @@ -341,45 +356,8 @@ const Arch Arch_empty ( IdString::Empty ); - const Arch Arch_noarch( _noarch ); - - const Arch Arch_pentium4( _pentium4 ); - const Arch Arch_pentium3( _pentium3 ); - - const Arch Arch_x86_64( _x86_64 ); - const Arch Arch_athlon( _athlon ); - const Arch Arch_i686 ( _i686 ); - const Arch Arch_i586 ( _i586 ); - const Arch Arch_i486 ( _i486 ); - const Arch Arch_i386 ( _i386 ); - - const Arch Arch_s390x ( _s390x ); - const Arch Arch_s390 ( _s390 ); - - const Arch Arch_ppc64 ( _ppc64 ); - const Arch Arch_ppc ( _ppc ); - - const Arch Arch_ia64 ( _ia64 ); - - const Arch Arch_alphaev67 ( _alphaev67 ); - const Arch Arch_alphaev6 ( _alphaev6 ); - const Arch Arch_alphapca56( _alphapca56 ); - const Arch Arch_alphaev56 ( _alphaev56 ); - const Arch Arch_alphaev5 ( _alphaev5 ); - const Arch Arch_alpha ( _alpha ); - - const Arch Arch_sparc64( _sparc64 ); - const Arch Arch_sparcv9( _sparcv9 ); - const Arch Arch_sparcv8( _sparcv8 ); - const Arch Arch_sparc ( _sparc ); - - const Arch Arch_armv6l ( _armv6l ); - const Arch Arch_armv5tejl( _armv5tejl ); - const Arch Arch_armv5tel ( _armv5tel ); - const Arch Arch_armv5l ( _armv5l ); - const Arch Arch_armv4tl ( _armv4tl ); - const Arch Arch_armv4l ( _armv4l ); - const Arch Arch_armv3l ( _armv3l ); + // all other Arch_* constants are defined via + // the DEF_BUILTIN macro. See Above. /////////////////////////////////////////////////////////////////// // Modified: trunk/libzypp/zypp/Arch.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Arch.h?rev=11534&r1… ============================================================================== --- trunk/libzypp/zypp/Arch.h (original) +++ trunk/libzypp/zypp/Arch.h Wed Oct 29 12:52:44 2008 @@ -222,6 +222,13 @@ /** \relates Arch */ extern const Arch Arch_armv3l; + /** \relates Arch */ + extern const Arch Arch_sh3; + + /** \relates Arch */ + extern const Arch Arch_sh4; + /** \relates Arch */ + extern const Arch Arch_sh4a; //@} /////////////////////////////////////////////////////////////////// -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r11533 - in /trunk/sat-solver: package/libsatsolver.changes src/poolarch.c
by mlandres＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: mlandres Date: Wed Oct 29 12:38:23 2008 New Revision: 11533 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11533&view=rev Log: - Add "sh4" architectures. Modified: trunk/sat-solver/package/libsatsolver.changes trunk/sat-solver/src/poolarch.c Modified: trunk/sat-solver/package/libsatsolver.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/package/libsatsolver.… ============================================================================== --- trunk/sat-solver/package/libsatsolver.changes (original) +++ trunk/sat-solver/package/libsatsolver.changes Wed Oct 29 12:38:23 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Oct 29 12:36:57 CET 2008 - ma(a)suse.de + +- Add 'sh4' architectures. + +------------------------------------------------------------------- Tue Oct 28 16:55:03 CET 2008 - ma(a)suse.de - Add 'arm' architectures. Modified: trunk/sat-solver/src/poolarch.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/poolarch.c?rev=11… ============================================================================== --- trunk/sat-solver/src/poolarch.c (original) +++ trunk/sat-solver/src/poolarch.c Wed Oct 29 12:38:23 2008 @@ -38,6 +38,9 @@ "armv4tl", "armv4tl:armv4l:armv3l", "armv4l", "armv4l:armv3l", "armv3l", "armv3l", + "sh3", "sh3", + "sh4", "sh4", + "sh4a", "sh4a:sh4", 0 }; -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r11532 - /trunk/zypper/package/zypper.changes
by jkupec＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: jkupec Date: Wed Oct 29 03:47:21 2008 New Revision: 11532 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11532&view=rev Log: - changes Modified: trunk/zypper/package/zypper.changes Modified: trunk/zypper/package/zypper.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/package/zypper.changes?re… ============================================================================== --- trunk/zypper/package/zypper.changes (original) +++ trunk/zypper/package/zypper.changes Wed Oct 29 03:47:21 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Oct 29 03:45:58 CET 2008 - jkupec(a)suse.cz + +- fix reporting of unknown options in a short options bunch + argument (e.g. -asdf) (bnc #299375) +- r11531 + +------------------------------------------------------------------- Tue Oct 28 15:36:42 CET 2008 - jkupec(a)suse.cz - fixed se -s to show multiple installed version of the same -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r11531 - /trunk/zypper/src/utils/getopt.cc
by jkupec＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: jkupec Date: Wed Oct 29 03:45:51 2008 New Revision: 11531 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11531&view=rev Log: - fix reporting of unknown options in a short options bunch argument (bnc #299375) Modified: trunk/zypper/src/utils/getopt.cc Modified: trunk/zypper/src/utils/getopt.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/utils/getopt.cc?rev=1… ============================================================================== --- trunk/zypper/src/utils/getopt.cc (original) +++ trunk/zypper/src/utils/getopt.cc Wed Oct 29 03:45:51 2008 @@ -44,17 +44,46 @@ string optstring = longopts2optstring (longopts); short2long_t short2long = make_short2long (longopts); + // optind in the previous loop + int optind_prev = optind; + // short option position in a short option bunch argument ('-xyz') + unsigned short_pos = 0; while (1) { int option_index = 0; - optc = getopt_long (argc, argv, optstring.c_str (), - longopts, &option_index); + optc = getopt_long(argc, argv, optstring.c_str (), longopts, &option_index); if (optc == -1) - break; // options done + break; // options done + + if (optind == optind_prev) + ++short_pos; switch (optc) { case '?': + // For '-garbage' argument, with 'a', 'b', and 'e' as known options, + // getopt_long reports 'a', 'b', and 'e' as known options. + // The rest ends here and it is either the last one from previous argument + // (short_pos + 1 points to it), or the short_pos one from the current + // argument. (bnc #299375) + + // wrong option in the last argument + cerr << _("Unknown option ") << "'"; + + if (optind != optind_prev) + { + // last argument was a short option bunch, report only the last one + if (short_pos) + cerr << *(argv[optind - 1] + short_pos+1); + else + cerr << argv[optind - 1]; + } + // wrong option in current argument, which is a short option bunch + else + cerr << *(argv[optind] + short_pos); + + cerr << "'" << endl; + + // tell the caller there have been uknown options encountered result["_unknown"].push_back(""); - cerr << _("Unknown option ") << argv[optind - 1] << endl; break; case ':': cerr << _("Missing argument for ") << argv[optind - 1] << endl; @@ -70,6 +99,10 @@ value.push_back (""); break; } + + if (optind != optind_prev) + short_pos = 0; + optind_prev = optind; } return result; } -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r11530 - /trunk/libzypp/package/libzypp.changes
by dmacvicar＠svn.opensuse.org 28 Oct '08

28 Oct '08

Author: dmacvicar Date: Tue Oct 28 22:19:29 2008 New Revision: 11530 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11530&view=rev Log: - sync changes file with change in autobuild Modified: trunk/libzypp/package/libzypp.changes Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?… ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Tue Oct 28 22:19:29 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Oct 28 22:01:40 CET 2008 - dmacvicar(a)suse.de + +- don't free the header before curl_perform as curl does not + copy it. (bnc#439532) + +------------------------------------------------------------------- Tue Oct 28 16:47:36 CET 2008 - ma(a)suse.de - Add 'arm' architectures. -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r11529 - in /trunk/libzypp: tests/zypp/ tests/zypp/data/Fetcher/remote-site/baseindex/ tests/zypp/data/Fetcher/remote-site/baseindex/subdir1/ tests/zypp/data/Fetcher/remote-site/baseindex/subdir2/ ...
by dmacvicar＠svn.opensuse.org 28 Oct '08

28 Oct '08

Author: dmacvicar Date: Tue Oct 28 17:31:15 2008 New Revision: 11529 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11529&view=rev Log: - more progress on fetcher capablity to use remote signed index. - support for content file - testcases - only missing, honour the autodiscovery of index flags Added: trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/directory.yast trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir1/ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir1/SHA1SUMS trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir1/SHA1SUMS.asc trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir1/SHA1SUMS.key trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir1/directory.yast trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir1/subdir1-file1.txt trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir1/subdir1-file2.txt trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir2/ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir2/SHA1SUMS trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir2/SHA1SUMS.asc trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir2/SHA1SUMS.key trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir2/directory.yast trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir2/subdir2-file1.txt trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/content trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/content.asc trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/content.key trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/directory.yast trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/subdir1/ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/subdir1/directory.yast trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/subdir1/subdir1-file1.txt trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/subdir1/subdir1-file2.txt trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/subdir2/ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/subdir2/directory.yast trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/subdir2/subdir2-file1.txt trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/content trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/content.asc trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/content.key trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/directory.yast trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/subdir1/ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/subdir1/directory.yast trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/subdir1/subdir1-file1.txt trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/subdir1/subdir1-file2.txt trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/subdir2/ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/subdir2/directory.yast trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/subdir2/subdir2-file1.txt Modified: trunk/libzypp/tests/zypp/Fetcher_test.cc trunk/libzypp/zypp/Fetcher.cc trunk/libzypp/zypp/Fetcher.h Modified: trunk/libzypp/tests/zypp/Fetcher_test.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/Fetcher_test.… ============================================================================== --- trunk/libzypp/tests/zypp/Fetcher_test.cc (original) +++ trunk/libzypp/tests/zypp/Fetcher_test.cc Tue Oct 28 17:31:15 2008 @@ -23,28 +23,6 @@ #define DATADIR (Pathname(TESTS_SRC_DIR) + "/zypp/data/Fetcher/remote-site") -BOOST_AUTO_TEST_CASE(fetcher_simple) -{ - MediaSetAccess media( (DATADIR).asUrl(), "/" ); - Fetcher fetcher; - - { - filesystem::TmpDir dest; - OnMediaLocation loc("/complexdir/subdir1/subdir1-file1.txt"); - loc.setChecksum(CheckSum::sha1("f1d2d2f924e986ac86fdf7b36c94bcdf32beec15")); - fetcher.enqueueDigested(loc); - fetcher.start(dest.path(), media); - fetcher.reset(); - // now we break the checksum and it should fail - loc.setChecksum(CheckSum::sha1("f1d2d2f924e986ac86fdf7b36c94bcdf32beec16")); - fetcher.enqueueDigested(loc); - BOOST_CHECK_THROW( fetcher.start( dest.path(), media ), Exception); - fetcher.reset(); - - } - -} - BOOST_AUTO_TEST_CASE(fetcher) { MediaSetAccess media( ( DATADIR).asUrl(), "/" ); @@ -100,6 +78,68 @@ //MIL << fetcher; } +BOOST_AUTO_TEST_CASE(fetcher_simple) +{ + MediaSetAccess media( (DATADIR).asUrl(), "/" ); + Fetcher fetcher; + + { + filesystem::TmpDir dest; + OnMediaLocation loc("/complexdir/subdir1/subdir1-file1.txt"); + loc.setChecksum(CheckSum::sha1("f1d2d2f924e986ac86fdf7b36c94bcdf32beec15")); + fetcher.enqueueDigested(loc); + fetcher.start(dest.path(), media); + fetcher.reset(); + // now we break the checksum and it should fail + loc.setChecksum(CheckSum::sha1("f1d2d2f924e986ac86fdf7b36c94bcdf32beec16")); + fetcher.enqueueDigested(loc); + BOOST_CHECK_THROW( fetcher.start( dest.path(), media ), Exception); + fetcher.reset(); + + } + +} + +BOOST_AUTO_TEST_CASE(content_index) +{ + MediaSetAccess media( ( DATADIR).asUrl(), "/" ); + Fetcher fetcher; + + // test transfering one file by setting the index + { + filesystem::TmpDir dest; + OnMediaLocation loc("/contentindex/subdir1/subdir1-file1.txt"); + // trust the key manually + getZYpp()->keyRing()->importKey(PublicKey(DATADIR + "/contentindex/content.key"), true); + fetcher.addIndex(OnMediaLocation("/contentindex/content", 1)); + fetcher.enqueue(loc); + fetcher.start(dest.path(), media); + fetcher.reset(); + } + +} + +BOOST_AUTO_TEST_CASE(content_index_broken) +{ + MediaSetAccess media( ( DATADIR).asUrl(), "/" ); + Fetcher fetcher; + + { + filesystem::TmpDir dest; + OnMediaLocation loc("/contentindex-broken-digest/subdir1/subdir1-file1.txt",1); + // key was already imported as trusted + fetcher.addIndex(OnMediaLocation("/contentindex-broken-digest/content", 1)); + fetcher.enqueue(loc); + fetcher.start(dest.path(), media); + fetcher.reset(); + // now retrieve a file that is modified, so the checksum has to fail + loc = OnMediaLocation("/contentindex-broken-digest/subdir1/subdir1-file2.txt",1); + fetcher.enqueue(loc); + BOOST_CHECK_THROW( fetcher.start( dest.path(), media ), Exception); + fetcher.reset(); + } +} + BOOST_AUTO_TEST_CASE(fetcher_remove) { // at this point the key is already trusted Added: trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/directory.yast URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/… ============================================================================== --- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/directory.yast (added) +++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/directory.yast Tue Oct 28 17:31:15 2008 @@ -0,0 +1,2 @@ +subdir1/ +subdir2/ Added: trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir1/SHA1SUMS URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/… ============================================================================== --- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir1/SHA1SUMS (added) +++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir1/SHA1SUMS Tue Oct 28 17:31:15 2008 @@ -0,0 +1,2 @@ +f1d2d2f924e986ac86fdf7b36c94bcdf32beec15 subdir1-file1.txt +e242ed3bffccdf271b7fbaf34ed72d089537b42f subdir1-file2.txt Added: trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir1/SHA1SUMS.asc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/… ============================================================================== --- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir1/SHA1SUMS.asc (added) +++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir1/SHA1SUMS.asc Tue Oct 28 17:31:15 2008 @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.9 (GNU/Linux) + +iEYEABECAAYFAkjaaxUACgkQm+zCtd2wN1ZLgACfcqpLHAavAr8cIjenaR3pJHpo +WoMAmwdbZQX2b9Yw6mY1aGbarwsEon6I +=/0VZ +-----END PGP SIGNATURE----- Added: trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir1/SHA1SUMS.key URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/… ============================================================================== --- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir1/SHA1SUMS.key (added) +++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir1/SHA1SUMS.key Tue Oct 28 17:31:15 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/baseindex/subdir1/directory.yast URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/… ============================================================================== --- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir1/directory.yast (added) +++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir1/directory.yast Tue Oct 28 17:31:15 2008 @@ -0,0 +1,6 @@ +directory.yast +SHA1SUMS +SHA1SUMS.asc +SHA1SUMS.key +subdir1-file1.txt +subdir1-file2.txt Added: trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir1/subdir1-file1.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/… ============================================================================== --- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir1/subdir1-file1.txt (added) +++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir1/subdir1-file1.txt Tue Oct 28 17:31:15 2008 @@ -0,0 +1 @@ +foo Added: trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir1/subdir1-file2.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/… ============================================================================== --- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir1/subdir1-file2.txt (added) +++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir1/subdir1-file2.txt Tue Oct 28 17:31:15 2008 @@ -0,0 +1 @@ +bar Added: trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir2/SHA1SUMS URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/… ============================================================================== --- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir2/SHA1SUMS (added) +++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir2/SHA1SUMS Tue Oct 28 17:31:15 2008 @@ -0,0 +1 @@ +f572d396fae9206628714fb2ce00f72e94f2258f subdir2-file1.txt Added: trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir2/SHA1SUMS.asc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/… ============================================================================== --- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir2/SHA1SUMS.asc (added) +++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir2/SHA1SUMS.asc Tue Oct 28 17:31:15 2008 @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.9 (GNU/Linux) + +iEYEABECAAYFAkjaayAACgkQm+zCtd2wN1Z3GwCfUjf9mRdFrB5UvOHAW/DoEzWL +mpEAnRmkzRLTY3hXiZ+95XCYG1csiMmF +=X6am +-----END PGP SIGNATURE----- Added: trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir2/SHA1SUMS.key URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/… ============================================================================== --- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir2/SHA1SUMS.key (added) +++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir2/SHA1SUMS.key Tue Oct 28 17:31:15 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/baseindex/subdir2/directory.yast URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/… ============================================================================== --- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir2/directory.yast (added) +++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir2/directory.yast Tue Oct 28 17:31:15 2008 @@ -0,0 +1,5 @@ +directory.yast +SHA1SUMS +SHA1SUMS.asc +SHA1SUMS.key +subdir2-file1.txt Added: trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir2/subdir2-file1.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/… ============================================================================== --- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir2/subdir2-file1.txt (added) +++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/baseindex/subdir2/subdir2-file1.txt Tue Oct 28 17:31:15 2008 @@ -0,0 +1 @@ +hello Added: trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/content URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/… ============================================================================== --- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/content (added) +++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/content Tue Oct 28 17:31:15 2008 @@ -0,0 +1,3 @@ +HASH SHA1 f1d2d2f924e986ac86fdf7b36c94bcdf32beec15 subdir1/subdir1-file1.txt +HASH SHA1 e242ed3bffccdf271b7fbaf34ed72d089537b42f subdir1/subdir1-file2.txt +HASH SHA1 f572d396fae9206628714fb2ce00f72e94f2258f subdir2/subdir2-file1.txt Added: trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/content.asc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/… ============================================================================== --- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/content.asc (added) +++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/content.asc Tue Oct 28 17:31:15 2008 @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.9 (GNU/Linux) + +iEYEABECAAYFAkkHLgwACgkQm+zCtd2wN1ZD7QCghDVP3V6Pi/gBMoA6Flc77/4u +f30Anjf9MqPHx/YZXSFHrYtcst0welTn +=g7it +-----END PGP SIGNATURE----- Added: trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/content.key URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/… ============================================================================== --- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/content.key (added) +++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/content.key Tue Oct 28 17:31:15 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/contentindex-broken-digest/directory.yast URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/… ============================================================================== --- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/directory.yast (added) +++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/directory.yast Tue Oct 28 17:31:15 2008 @@ -0,0 +1,3 @@ +directory.yast +subdir1/ +subdir2/ Added: trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/subdir1/directory.yast URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/… ============================================================================== --- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/subdir1/directory.yast (added) +++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/subdir1/directory.yast Tue Oct 28 17:31:15 2008 @@ -0,0 +1,6 @@ +directory.yast +SHA1SUMS +SHA1SUMS.asc +SHA1SUMS.key +subdir1-file1.txt +subdir1-file2.txt Added: trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/subdir1/subdir1-file1.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/… ============================================================================== --- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/subdir1/subdir1-file1.txt (added) +++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/subdir1/subdir1-file1.txt Tue Oct 28 17:31:15 2008 @@ -0,0 +1 @@ +foo Added: trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/subdir1/subdir1-file2.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/… ============================================================================== --- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/subdir1/subdir1-file2.txt (added) +++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/subdir1/subdir1-file2.txt Tue Oct 28 17:31:15 2008 @@ -0,0 +1 @@ +bar OWNED Added: trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/subdir2/directory.yast URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/… ============================================================================== --- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/subdir2/directory.yast (added) +++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/subdir2/directory.yast Tue Oct 28 17:31:15 2008 @@ -0,0 +1,5 @@ +directory.yast +SHA1SUMS +SHA1SUMS.asc +SHA1SUMS.key +subdir2-file1.txt Added: trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/subdir2/subdir2-file1.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/… ============================================================================== --- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/subdir2/subdir2-file1.txt (added) +++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex-broken-digest/subdir2/subdir2-file1.txt Tue Oct 28 17:31:15 2008 @@ -0,0 +1 @@ +hello Added: trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/content URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/… ============================================================================== --- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/content (added) +++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/content Tue Oct 28 17:31:15 2008 @@ -0,0 +1,3 @@ +HASH SHA1 f1d2d2f924e986ac86fdf7b36c94bcdf32beec15 subdir1/subdir1-file1.txt +HASH SHA1 e242ed3bffccdf271b7fbaf34ed72d089537b42f subdir1/subdir1-file2.txt +HASH SHA1 f572d396fae9206628714fb2ce00f72e94f2258f subdir2/subdir2-file1.txt Added: trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/content.asc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/… ============================================================================== --- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/content.asc (added) +++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/content.asc Tue Oct 28 17:31:15 2008 @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.9 (GNU/Linux) + +iEYEABECAAYFAkkHLgwACgkQm+zCtd2wN1ZD7QCghDVP3V6Pi/gBMoA6Flc77/4u +f30Anjf9MqPHx/YZXSFHrYtcst0welTn +=g7it +-----END PGP SIGNATURE----- Added: trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/content.key URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/… ============================================================================== --- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/content.key (added) +++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/content.key Tue Oct 28 17:31:15 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/contentindex/directory.yast URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/… ============================================================================== --- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/directory.yast (added) +++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/directory.yast Tue Oct 28 17:31:15 2008 @@ -0,0 +1,2 @@ +subdir1/ +subdir2/ Added: trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/subdir1/directory.yast URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/… ============================================================================== --- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/subdir1/directory.yast (added) +++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/subdir1/directory.yast Tue Oct 28 17:31:15 2008 @@ -0,0 +1,6 @@ +directory.yast +SHA1SUMS +SHA1SUMS.asc +SHA1SUMS.key +subdir1-file1.txt +subdir1-file2.txt Added: trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/subdir1/subdir1-file1.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/… ============================================================================== --- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/subdir1/subdir1-file1.txt (added) +++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/subdir1/subdir1-file1.txt Tue Oct 28 17:31:15 2008 @@ -0,0 +1 @@ +foo Added: trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/subdir1/subdir1-file2.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/… ============================================================================== --- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/subdir1/subdir1-file2.txt (added) +++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/subdir1/subdir1-file2.txt Tue Oct 28 17:31:15 2008 @@ -0,0 +1 @@ +bar Added: trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/subdir2/directory.yast URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/… ============================================================================== --- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/subdir2/directory.yast (added) +++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/subdir2/directory.yast Tue Oct 28 17:31:15 2008 @@ -0,0 +1,5 @@ +directory.yast +SHA1SUMS +SHA1SUMS.asc +SHA1SUMS.key +subdir2-file1.txt Added: trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/subdir2/subdir2-file1.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Fetcher/… ============================================================================== --- trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/subdir2/subdir2-file1.txt (added) +++ trunk/libzypp/tests/zypp/data/Fetcher/remote-site/contentindex/subdir2/subdir2-file1.txt Tue Oct 28 17:31:15 2008 @@ -0,0 +1 @@ +hello Modified: trunk/libzypp/zypp/Fetcher.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Fetcher.cc?rev=1152… ============================================================================== --- trunk/libzypp/zypp/Fetcher.cc (original) +++ trunk/libzypp/zypp/Fetcher.cc Tue Oct 28 17:31:15 2008 @@ -14,7 +14,6 @@ #include <list> #include <map> -#include "zypp/base/Flags.h" #include "zypp/base/Easy.h" #include "zypp/base/Logger.h" #include "zypp/base/PtrTypes.h" @@ -23,6 +22,8 @@ #include "zypp/Fetcher.h" #include "zypp/CheckSum.h" #include "zypp/base/UserRequestException.h" +#include "zypp/parser/susetags/ContentFileReader.h" +#include "zypp/parser/susetags/RepoIndex.h" using namespace std; @@ -89,11 +90,15 @@ { friend std::ostream & operator<<( std::ostream & str, const Fetcher::Impl & obj ); public: - Impl() {} + Impl(); + ~Impl() { MIL << endl; } + void setOptions( Fetcher::Options options ); + Fetcher::Options options() const; + void addIndex( const OnMediaLocation &resource ); void enqueue( const OnMediaLocation &resource, const FileChecker &checker = FileChecker() ); void enqueueDir( const OnMediaLocation &resource, bool recursive, const FileChecker &checker = FileChecker() ); @@ -124,6 +129,12 @@ * normally the same as the index file is located. */ void readIndex( const Pathname &index, const Pathname &basedir ); + + /** specific version of \ref readIndex for SHA1SUMS file */ + void readSha1sumsIndex( const Pathname &index, const Pathname &basedir ); + + /** specific version of \ref readIndex for SHA1SUMS file */ + void readContentFileIndex( const Pathname &index, const Pathname &basedir ); /** * tries to provide the file represented by job into dest_dir by @@ -159,6 +170,7 @@ list<Pathname> _caches; // checksums read from the indexes map<string, CheckSum> _checksums; + Fetcher::Options _options; }; /////////////////////////////////////////////////////////////////// @@ -172,7 +184,18 @@ job->checkers.push_back(checker); _resources.push_back(job); } - + + Fetcher::Impl::Impl() + : _options(0) + { + } + + void Fetcher::Impl::setOptions( Fetcher::Options options ) + { _options = options; } + + Fetcher::Options Fetcher::Impl::options() const + { return _options; } + void Fetcher::Impl::enqueueDir( const OnMediaLocation &resource, bool recursive, const FileChecker &checker ) @@ -425,7 +448,46 @@ } } - void Fetcher::Impl::readIndex( const Pathname &index, const Pathname &basedir ) + // helper class to consume a content file + struct ContentReaderHelper : public parser::susetags::ContentFileReader + { + ContentReaderHelper() + { + setRepoIndexConsumer( bind( &ContentReaderHelper::consumeIndex, this, _1 ) ); + } + + void consumeIndex( const parser::susetags::RepoIndex_Ptr & data_r ) + { _repoindex = data_r; } + + parser::susetags::RepoIndex_Ptr _repoindex; + }; + + // generic function for reading indexes + void Fetcher::Impl::readIndex( const Pathname &index, const Pathname &basedir ) + { + if ( index.basename() == "SHA1SUMS" ) + readSha1sumsIndex(index, basedir); + else if ( index.basename() == "content" ) + readContentFileIndex(index, basedir); + else + WAR << index << ": index file format not known" << endl; + } + + // reads a content file index + void Fetcher::Impl::readContentFileIndex( const Pathname &index, const Pathname &basedir ) + { + ContentReaderHelper reader; + reader.parse(index); + MIL << index << " contains " << reader._repoindex->mediaFileChecksums.size() << " checksums." << endl; + for_( it, reader._repoindex->mediaFileChecksums.begin(), reader._repoindex->mediaFileChecksums.end() ) + { + // content file entries don't start with / + _checksums[(basedir + it->first).asString()] = it->second; + } + } + + // reads a SHA1SUMS file index + void Fetcher::Impl::readSha1sumsIndex( const Pathname &index, const Pathname &basedir ) { std::ifstream in( index.c_str() ); string buffer; @@ -522,6 +584,20 @@ provideToDest(media, (*it_res)->location, dest_dir); + // 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() ) + { + if ( _checksums.find((*it_res)->location.filename().asString()) + != _checksums.end() ) + { + // the checksum can be replaced with the one in the index. + CheckSum chksm = _checksums[(*it_res)->location.filename().asString()]; + ChecksumFileChecker digest_check(chksm); + (*it_res)->checkers.push_back(digest_check); + } + } + // validate job, this throws if not valid validate((*it_res)->location, dest_dir, (*it_res)->checkers); @@ -563,6 +639,16 @@ Fetcher::~Fetcher() {} + void Fetcher::setOptions( Fetcher::Options options ) + { + _pimpl->setOptions(options); + } + + Fetcher::Options Fetcher::options() const + { + return _pimpl->options(); + } + void Fetcher::enqueueDigested( const OnMediaLocation &resource, const FileChecker &checker ) { _pimpl->enqueueDigested(resource, checker); Modified: trunk/libzypp/zypp/Fetcher.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Fetcher.h?rev=11529… ============================================================================== --- trunk/libzypp/zypp/Fetcher.h (original) +++ trunk/libzypp/zypp/Fetcher.h Tue Oct 28 17:31:15 2008 @@ -15,6 +15,7 @@ #include <iosfwd> #include <list> +#include "zypp/base/Flags.h" #include "zypp/base/PtrTypes.h" #include "zypp/Pathname.h" #include "zypp/Url.h" @@ -41,7 +42,7 @@ * \code * MediaSetAccess access(url, path); * Fetcher fetcher; - * fetcher.enqueue( OnMediaLocation().filename("/content") ); + * fetcher.enqueue( OnMediaLocation().setLocation("/somefile") ); * fetcher.addCachePath("/tmp/cache") * fetcher.start( "/download-dir, access ); * fetcher.reset(); @@ -60,16 +61,67 @@ * * If you need to use more than one checker * \see CompositeFileChecker + * + * Additionally, you can automatically enqueue a job + * with a checksum checker by using \ref enqueueDigested + * which will use the \ref OnMediaLocation checksum + * automatically. + * + * \code + * location.setChecksum(CheckSum("sha1", "....")); + * fetcher.enqueueDigested(location); + * \endcode + * + * \note If the checksum of the location is empty, but + * \ref enqueueDigested is used, then the user will get a + * warning that the file has no checksum. + * + * Additionally, Fetcher supports checking the downloaded + * content by using signed indexes on the remote side. + * + * \code + * MediaSetAccess access(url, path); + * Fetcher fetcher; + * fetcher.addIndex(OnMediaLocation("/content")); + * fetcher.enqueue( OnMediaLocation().setLocation("/somefile") ); + * fetcher.start( "/download-dir, access ); + * fetcher.reset(); + * \endcode + * + * */ class Fetcher { friend std::ostream & operator<<( std::ostream & str, const Fetcher & obj ); - public: /** Implementation */ class Impl; public: + + /** + * Various option flags to change behavior + */ + enum Option + { + /** + * If a content file is found, it is + * downloaded and read. + */ + AutoAddContentFileIndexes = 0x0001, + /** + * If a SHA1SUMS file is found, it is + * downloaded and read. + */ + AutoAddSha1sumsIndexes = 0x0002, + /** + * If a content or SHA1SUMS file is found, + * it is downloaded and read. + */ + AutoAddIndexes = 0x0001 | 0x0002, + }; + ZYPP_DECLARE_FLAGS(Options, Option); + /** Default ctor */ Fetcher(); /** Dtor */ @@ -77,6 +129,17 @@ public: + /** + * Set the Fetcher options + * \see Fetcher::Options + */ + void setOptions( Options options ); + + /** + * Get current options + * \see Fetcher::Options + */ + Options options() const; /** * Adds an index containing metadata (for example @@ -89,10 +152,21 @@ * The index is relative to the media path, and * the listed files too. * + * Indexes in the SHA1SUM format, and YaST + * content file + * + * The file has to be signed or the user will be + * warned that the file is unsigned. You can + * place the signature next to the file adding the + * .asc extension. + * + * If you expect the key to not to be in the target + * system, then you can place it next to the index + * using adding the .key extension. + * */ void addIndex( const OnMediaLocation &resource ); - /** * Enqueue a object for transferal, they will not * be transfered until \ref start() is called @@ -172,13 +246,14 @@ */ void start( const Pathname &dest_dir, MediaSetAccess &media, - const ProgressData::ReceiverFnc & progress = ProgressData::ReceiverFnc() ); + const ProgressData::ReceiverFnc & progress = ProgressData::ReceiverFnc() ); private: /** Pointer to implementation */ RWCOW_pointer<Impl> _pimpl; }; /////////////////////////////////////////////////////////////////// + ZYPP_DECLARE_OPERATORS_FOR_FLAGS(Fetcher::Options); /** \relates Fetcher Stream output */ std::ostream & operator<<( std::ostream & str, const Fetcher & obj ); -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r11528 - in /trunk/libzypp/zypp: Target.cc Target.h media/MediaAria2c.cc media/MediaAria2c.h media/MediaCurl.cc media/MediaCurl.h target/TargetImpl.cc target/TargetImpl.h
by dmacvicar＠svn.opensuse.org 28 Oct '08

28 Oct '08

Author: dmacvicar Date: Tue Oct 28 17:31:13 2008 New Revision: 11528 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11528&view=rev Log: - add Target::baseProduct for convenence. disable flavor header for now until I find a better solution Modified: trunk/libzypp/zypp/Target.cc trunk/libzypp/zypp/Target.h trunk/libzypp/zypp/media/MediaAria2c.cc trunk/libzypp/zypp/media/MediaAria2c.h trunk/libzypp/zypp/media/MediaCurl.cc trunk/libzypp/zypp/media/MediaCurl.h trunk/libzypp/zypp/target/TargetImpl.cc trunk/libzypp/zypp/target/TargetImpl.h Modified: trunk/libzypp/zypp/Target.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Target.cc?rev=11528… ============================================================================== --- trunk/libzypp/zypp/Target.cc (original) +++ trunk/libzypp/zypp/Target.cc Tue Oct 28 17:31:13 2008 @@ -109,6 +109,10 @@ std::string Target::distributionVersion() const { return _pimpl->distributionVersion(); } + Product::constPtr Target::baseProduct() const + { return _pimpl->baseProduct(); } + + ///////////////////////////////////////////////////////////////// } // namespace zypp /////////////////////////////////////////////////////////////////// Modified: trunk/libzypp/zypp/Target.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Target.h?rev=11528&… ============================================================================== --- trunk/libzypp/zypp/Target.h (original) +++ trunk/libzypp/zypp/Target.h Tue Oct 28 17:31:13 2008 @@ -19,6 +19,7 @@ #include "zypp/base/PtrTypes.h" #include "zypp/base/Deprecated.h" +#include "zypp/Product.h" #include "zypp/Pathname.h" #include "zypp/ResPool.h" @@ -104,6 +105,24 @@ /** return the last modification date of the target */ Date timestamp() const; + /** + * returns the target base installed product, also known as + * the distribution or platform. + * + * returns 0 if there is no base installed product in the + * pool. + * + * \note this method requires the target to be loaded, + * otherwise it will return 0 as no product is found. + * + * if you require some base product attributes when the + * target is not loaded into the pool, see + * \ref targetDistribution , \ref targetDistributionRelease + * and \ref distributionVersion that obtain the data + * on demand from the installed product information. + */ + Product::constPtr baseProduct() const; + /** \name Base product and registration. */ //@{ /** The targets distribution release string (/etc/SuSE-release) Modified: trunk/libzypp/zypp/media/MediaAria2c.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/media/MediaAria2c.c… ============================================================================== --- trunk/libzypp/zypp/media/MediaAria2c.cc (original) +++ trunk/libzypp/zypp/media/MediaAria2c.cc Tue Oct 28 17:31:13 2008 @@ -79,7 +79,7 @@ return false; } -const char *const MediaAria2c::anonymousIdHeader() +static const char *const anonymousIdHeader() { // we need to add the release and identifier to the // agent string. @@ -200,7 +200,6 @@ // add the anonymous id. _args.push_back(str::form("--header=%s", anonymousIdHeader() )); - // TODO add debug option // Transfer timeout Modified: trunk/libzypp/zypp/media/MediaAria2c.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/media/MediaAria2c.h… ============================================================================== --- trunk/libzypp/zypp/media/MediaAria2c.h (original) +++ trunk/libzypp/zypp/media/MediaAria2c.h Tue Oct 28 17:31:13 2008 @@ -88,10 +88,7 @@ protected: - /** The user agent string */ static const char *const agentString(); - /** anonymous id header used to count unique users */ - static const char *const anonymousIdHeader(); private: Modified: trunk/libzypp/zypp/media/MediaCurl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/media/MediaCurl.cc?… ============================================================================== --- trunk/libzypp/zypp/media/MediaCurl.cc (original) +++ trunk/libzypp/zypp/media/MediaCurl.cc Tue Oct 28 17:31:13 2008 @@ -185,7 +185,7 @@ Pathname MediaCurl::_cookieFile = "/var/lib/YaST2/cookies"; -const char *const MediaCurl::anonymousIdHeader() +static const char *const anonymousIdHeader() { // we need to add the release and identifier to the // agent string. @@ -209,8 +209,8 @@ ); return _value.c_str(); } - -const char *const MediaCurl::agentString() + +static const char *const agentString() { // we need to add the release and identifier to the // agent string. @@ -706,6 +706,7 @@ // now add the anonymous id header _customHeaders = curl_slist_append(_customHeaders, anonymousIdHeader()); + ret = curl_easy_setopt ( _curl, CURLOPT_HTTPHEADER, _customHeaders ); if ( ret != 0) { Modified: trunk/libzypp/zypp/media/MediaCurl.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/media/MediaCurl.h?r… ============================================================================== --- trunk/libzypp/zypp/media/MediaCurl.h (original) +++ trunk/libzypp/zypp/media/MediaCurl.h Tue Oct 28 17:31:13 2008 @@ -94,13 +94,6 @@ static int progressCallback( void *clientp, double dltotal, double dlnow, double ultotal, double ulnow ); - - /** The user agent string */ - static const char *const agentString(); - - /** anonymous id header used to count unique users */ - static const char *const anonymousIdHeader(); - private: /** * Return a comma separated list of available authentication methods Modified: trunk/libzypp/zypp/target/TargetImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/target/TargetImpl.c… ============================================================================== --- trunk/libzypp/zypp/target/TargetImpl.cc (original) +++ trunk/libzypp/zypp/target/TargetImpl.cc Tue Oct 28 17:31:13 2008 @@ -936,6 +936,22 @@ } } + Product::constPtr TargetImpl::baseProduct() const + { + ResPool pool(ResPool::instance()); + for_( it, pool.byKindBegin<Product>(), pool.byKindEnd<Product>() ) + { + Product::constPtr p = asKind<Product>((*it).resolvable()); + if ( p && (*it).status().isInstalled() ) + { + if ( p->isTargetDistribution() ) + return p; + } + } + + return 0L; + } + std::string TargetImpl::targetDistribution() const { return rpmdb2solvAttr( "register.target", _root ); } Modified: trunk/libzypp/zypp/target/TargetImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/target/TargetImpl.h… ============================================================================== --- trunk/libzypp/zypp/target/TargetImpl.h (original) +++ trunk/libzypp/zypp/target/TargetImpl.h Tue Oct 28 17:31:13 2008 @@ -138,6 +138,9 @@ /** return the last modification date of the target */ Date timestamp() const; + /** \copydoc Target::baseProduct() */ + Product::constPtr baseProduct() const; + /** \copydoc Target::release() */ std::string release() const; -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r11527 - in /trunk/libzypp/zypp/media: MediaAria2c.cc MediaCurl.cc MediaCurl.h
by dmacvicar＠svn.opensuse.org 28 Oct '08

28 Oct '08

Author: dmacvicar Date: Tue Oct 28 17:31:12 2008 New Revision: 11527 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11527&view=rev Log: - fix curl anonymous id header - rename the header name to make it a little bit shorter Modified: trunk/libzypp/zypp/media/MediaAria2c.cc trunk/libzypp/zypp/media/MediaCurl.cc trunk/libzypp/zypp/media/MediaCurl.h Modified: trunk/libzypp/zypp/media/MediaAria2c.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/media/MediaAria2c.c… ============================================================================== --- trunk/libzypp/zypp/media/MediaAria2c.cc (original) +++ trunk/libzypp/zypp/media/MediaAria2c.cc Tue Oct 28 17:31:12 2008 @@ -98,12 +98,12 @@ static const std::string _value( str::form( - "X-ZYpp-AnonymousUniqueId: %s", + "X-Zypp-AnonymousId: %s", target ? target->anonymousUniqueId().c_str() : "" ) ); return _value.c_str(); } - + const char *const MediaAria2c::agentString() { // we need to add the release and identifier to the Modified: trunk/libzypp/zypp/media/MediaCurl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/media/MediaCurl.cc?… ============================================================================== --- trunk/libzypp/zypp/media/MediaCurl.cc (original) +++ trunk/libzypp/zypp/media/MediaCurl.cc Tue Oct 28 17:31:12 2008 @@ -203,9 +203,9 @@ } static const std::string _value( - str::form( - "X-ZYpp-AnonymousUniqueId: %s", - target ? target->anonymousUniqueId().c_str() : "" ) + str::trim( str::form( + "X-ZYpp-AnonymousId: %s", + target ? target->anonymousUniqueId().c_str() : "" ) ) ); return _value.c_str(); } @@ -244,7 +244,8 @@ : MediaHandler( url_r, attach_point_hint_r, "/", // urlpath at attachpoint true ), // does_download - _curl( NULL ) + _curl( NULL ), + _customHeaders(0L) { _curlError[0] = '\0'; _curlDebug = 0L; @@ -491,18 +492,7 @@ disconnectFrom(); ZYPP_THROW(MediaCurlSetOptException(_url, _curlError)); } - - // now add the anonymous id header - curl_slist *chunk = NULL; - chunk = curl_slist_append(chunk, anonymousIdHeader()); - ret = curl_easy_setopt ( _curl, CURLOPT_HTTPHEADER, chunk ); - curl_slist_free_all(chunk); - if ( ret != 0) { - disconnectFrom(); - ZYPP_THROW(MediaCurlSetOptException(_url, _curlError)); - } - } @@ -714,6 +704,14 @@ ZYPP_THROW(MediaCurlSetOptException(_url, _curlError)); } + // now add the anonymous id header + _customHeaders = curl_slist_append(_customHeaders, anonymousIdHeader()); + ret = curl_easy_setopt ( _curl, CURLOPT_HTTPHEADER, _customHeaders ); + + if ( ret != 0) { + disconnectFrom(); + ZYPP_THROW(MediaCurlSetOptException(_url, _curlError)); + } // FIXME: need a derived class to propelly compare url's MediaSourceRef media( new MediaSource(_url.getScheme(), _url.asString())); @@ -734,6 +732,12 @@ // void MediaCurl::disconnectFrom() { + if ( _customHeaders ) + { + curl_slist_free_all(_customHeaders); + _customHeaders = 0L; + } + if ( _curl ) { curl_easy_cleanup( _curl ); Modified: trunk/libzypp/zypp/media/MediaCurl.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/media/MediaCurl.h?r… ============================================================================== --- trunk/libzypp/zypp/media/MediaCurl.h (original) +++ trunk/libzypp/zypp/media/MediaCurl.h Tue Oct 28 17:31:12 2008 @@ -114,6 +114,7 @@ CURL *_curl; char _curlError[ CURL_ERROR_SIZE ]; long _curlDebug; + curl_slist *_customHeaders; mutable std::string _userpwd; std::string _proxy; -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r11526 - in /trunk/sat-solver: package/libsatsolver.changes src/poolarch.c
by mlandres＠svn.opensuse.org 28 Oct '08

28 Oct '08

Author: mlandres Date: Tue Oct 28 16:55:46 2008 New Revision: 11526 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11526&view=rev Log: - Add "arm" architectures. Modified: trunk/sat-solver/package/libsatsolver.changes trunk/sat-solver/src/poolarch.c Modified: trunk/sat-solver/package/libsatsolver.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/package/libsatsolver.… ============================================================================== --- trunk/sat-solver/package/libsatsolver.changes (original) +++ trunk/sat-solver/package/libsatsolver.changes Tue Oct 28 16:55:46 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Oct 28 16:55:03 CET 2008 - ma(a)suse.de + +- Add 'arm' architectures. + +------------------------------------------------------------------- Mon Oct 27 10:54:36 CET 2008 - kkaempf(a)suse.de - Improve error detection and reporting when parsing 'content' file Modified: trunk/sat-solver/src/poolarch.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/poolarch.c?rev=11… ============================================================================== --- trunk/sat-solver/src/poolarch.c (original) +++ trunk/sat-solver/src/poolarch.c Tue Oct 28 16:55:46 2008 @@ -7,7 +7,7 @@ /* * poolarch.c - * + * * create architecture policies */ @@ -21,16 +21,23 @@ #include "util.h" const char *archpolicies[] = { - "x86_64", "x86_64:i686:i586:i486:i386", - "i686", "i686:i586:i486:i386", - "i586", "i586:i486:i386", - "i486", "i486:i386", - "i386", "i386", - "s390x", "s390x:s390", - "s390", "s390", - "ia64", "ia64:i686:i586:i486:i386", - "ppc64", "ppc64:ppc", - "ppc", "ppc", + "x86_64", "x86_64:i686:i586:i486:i386", + "i686", "i686:i586:i486:i386", + "i586", "i586:i486:i386", + "i486", "i486:i386", + "i386", "i386", + "s390x", "s390x:s390", + "s390", "s390", + "ia64", "ia64:i686:i586:i486:i386", + "ppc64", "ppc64:ppc", + "ppc", "ppc", + "armv6l", "armv6l:armv5tejl:armv5tel:armv5l:armv4tl:armv4l:armv3l", + "armv5tejl", "armv5tejl:armv5tel:armv5l:armv4tl:armv4l:armv3l", + "armv5tel", "armv5tel:armv5l:armv4tl:armv4l:armv3l", + "armv5l", "armv5l:armv4tl:armv4l:armv3l", + "armv4tl", "armv4tl:armv4l:armv3l", + "armv4l", "armv4l:armv3l", + "armv3l", "armv3l", 0 }; @@ -45,7 +52,7 @@ int i; Id *id2arch; Id id, lastarch; - + pool->id2arch = sat_free(pool->id2arch); if (!arch) { -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0