October 2008 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r11494 - /trunk/sat-solver/tools/repo_content.c
by kkaempf＠svn.opensuse.org 27 Oct '08

27 Oct '08

Author: kkaempf Date: Mon Oct 27 10:32:19 2008 New Revision: 11494 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11494&view=rev Log: improve error output (http://lists.opensuse.org/opensuse-factory/2008-10/msg00589.html) Modified: trunk/sat-solver/tools/repo_content.c Modified: trunk/sat-solver/tools/repo_content.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_content.c?… ============================================================================== --- trunk/sat-solver/tools/repo_content.c (original) +++ trunk/sat-solver/tools/repo_content.c Mon Oct 27 10:32:19 2008 @@ -142,7 +142,7 @@ if (!rel || !evr) { - fprintf(stderr, "bad relation '%s %s'\n", name, rel); + fprintf(stderr, "repo_content: bad relation '%s %s'\n", name, rel); exit(1); } for (flags = 0; flags < 6; flags++) @@ -150,7 +150,7 @@ break; if (flags == 6) { - fprintf(stderr, "Unknown relation '%s'\n", rel); + fprintf(stderr, "repo_content: Unknown relation '%s'\n", rel); exit(1); } id = rel2id(pool, id, str2id(pool, evr, 1), flags + 1, 1); @@ -404,12 +404,12 @@ #undef istag } else - fprintf (stderr, "malformed line: %s\n", line); + fprintf (stderr, "repo_content: malformed line: %s\n", line); } if (!s || !s->name) { - fprintf(stderr, "No product solvable created !\n"); + fprintf(stderr, "repo_content: 'content' incomplete, no product solvable created !\n"); exit(1); } -- 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] r11493 - /trunk/zypper/src/install.cc
by jkupec＠svn.opensuse.org 26 Oct '08

26 Oct '08

Author: jkupec Date: Sun Oct 26 22:04:38 2008 New Revision: 11493 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11493&view=rev Log: - better error message Modified: trunk/zypper/src/install.cc Modified: trunk/zypper/src/install.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/install.cc?rev=11493&… ============================================================================== --- trunk/zypper/src/install.cc (original) +++ trunk/zypper/src/install.cc Sun Oct 26 22:04:38 2008 @@ -508,13 +508,11 @@ continue; } - // recognize missplaced command line options given as packages - // bnc#391644 + // recognize missplaced command line options given as packages (bnc#391644) if ( str[0] == '-' ) { - // FIXME show a message here, after string freeze - //zypper.out().error(boost::str(format(_("%s is not a valid package or capability name.") % str)); - zypper.out().error(_("No valid arguments specified.")); + zypper.out().error(boost::str(format( + _("'%s' is not a valid package or capability name.")) % str)); zypper.setExitCode(ZYPPER_EXIT_ERR_INVALID_ARGS); ZYPP_THROW(ExitRequestException()); } -- 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] r11492 - /trunk/zypper/package/zypper.changes
by jkupec＠svn.opensuse.org 26 Oct '08

26 Oct '08

Author: jkupec Date: Sun Oct 26 16:14:00 2008 New Revision: 11492 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11492&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 Sun Oct 26 16:14:00 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Sun Oct 26 16:11:44 CET 2008 - jkupec(a)suse.cz + +- 'rm -t patch' now tells the user that patches can't get + uninstalled (bnc #402640). The same for patterns, untill pattern + removal is defined and implemented. +- r11491 + +------------------------------------------------------------------- Thu Oct 23 14:29:38 CEST 2008 - jkupec(a)suse.cz - more appropriate 'accept key' dialog (bnc #436794) -- 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] r11491 - in /trunk/zypper: doc/zypper.8 src/install.cc
by jkupec＠svn.opensuse.org 26 Oct '08

26 Oct '08

Author: jkupec Date: Sun Oct 26 16:10:55 2008 New Revision: 11491 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11491&view=rev Log: - 'rm -t patch' now tells the user that patches can't get uninstalled (bnc #402640) Modified: trunk/zypper/doc/zypper.8 trunk/zypper/src/install.cc Modified: trunk/zypper/doc/zypper.8 URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/doc/zypper.8?rev=11491&r1… ============================================================================== --- trunk/zypper/doc/zypper.8 (original) +++ trunk/zypper/doc/zypper.8 Sun Oct 26 16:10:55 2008 @@ -138,7 +138,10 @@ .TP .B info (if) <name> ... -Displays full info for the specified packages. +Displays detailed informaion about the specified packages. + +For each specified package, zypper finds the best available version in defined +repositories and shows information for this package. .TP .I \-r, \-\-repo <alias|#|URI> @@ -291,7 +294,15 @@ Remove (uninstall) packages. The packages can be selected by their name or by a capability they provide. -For details see the install command +For details on package selection see the install command description. + +Since \fBpatches\fR are not installed in sense of copying files or recording +a database entry, they cannot be uninstalled, even though zypper shows +them as installed. The installed status is determined solely based on +the installed status of its required dependencies. If these dependencies +are satisified, the patch is rendered installed. + +Uninstallation of \fBpatterns\fR is currently not implemented. .TP \fI\-r, \-\-repo\fR <alias|#|URI> Modified: trunk/zypper/src/install.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/install.cc?rev=11491&… ============================================================================== --- trunk/zypper/src/install.cc (original) +++ trunk/zypper/src/install.cc Sun Oct 26 16:10:55 2008 @@ -420,7 +420,27 @@ { if (args.empty()) return; - + + if (kind == ResKind::patch && !install_not_remove) + { + zypper.out().error( + _("Cannot uninstall patches."), + _("Installed status of a patch is determined solely based on its dependencies.\n" + "Patches are not installed in sense of copied files, database records,\n" + "or similar.")); + zypper.setExitCode(ZYPPER_EXIT_ERR_INVALID_ARGS); + throw ExitRequestException("not implemented"); + } + + if (kind == ResKind::pattern && !install_not_remove) + { + //! \todo define and implement pattern removal (bnc #407040) + zypper.out().error( + _("Uninstallation of a pattern is currently not defined and implemented.")); + zypper.setExitCode(ZYPPER_EXIT_ERR_INVALID_ARGS); + throw ExitRequestException("not implemented"); + } + bool force_by_capability = zypper.cOpts().count("capability"); bool force_by_name = zypper.cOpts().count("name"); bool force = zypper.cOpts().count("force"); @@ -431,7 +451,7 @@ { zypper.out().error(boost::str( format(_("%s contradicts %s")) % "--capability" % (force? "--force" : "--name"))); - + zypper.setExitCode(ZYPPER_EXIT_ERR_INVALID_ARGS); ZYPP_THROW(ExitRequestException()); } @@ -498,7 +518,7 @@ zypper.setExitCode(ZYPPER_EXIT_ERR_INVALID_ARGS); ZYPP_THROW(ExitRequestException()); } - + // is version specified? by_capability = str.find_first_of("=<>") != string::npos; @@ -579,7 +599,7 @@ // is the provider already installed? bool installed = false; - string provider; + string provider; for_(solvit, q.poolItemBegin(), q.poolItemEnd()) { if (traits::isPseudoInstalled(solvit->resolvable()->kind())) @@ -588,7 +608,7 @@ installed = solvit->status().isInstalled(); if (installed) { - provider = solvit->resolvable()->name(); + provider = solvit->resolvable()->name(); break; } } -- 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] r11490 - /trunk/libzypp/package/libzypp.changes
by coolo＠svn.opensuse.org 26 Oct '08

26 Oct '08

Author: coolo Date: Sun Oct 26 15:24:33 2008 New Revision: 11490 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11490&view=rev Log: submitted 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 Sun Oct 26 15:24:33 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Sun Oct 26 14:53:56 CET 2008 - coolo(a)suse.de + +- adding svn r11488 to fix compile of PackageKit + +------------------------------------------------------------------- Fri Oct 24 18:12:34 CEST 2008 - ma(a)suse.de - Remove error prone methods from OnMediaLocation API to prevent -- 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] r11489 - /trunk/sat-solver/package/libsatsolver.spec.in
by mlschroe＠svn.opensuse.org 25 Oct '08

25 Oct '08

Author: mlschroe Date: Sat Oct 25 11:24:50 2008 New Revision: 11489 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11489&view=rev Log: - more fixes for fedora... Modified: trunk/sat-solver/package/libsatsolver.spec.in Modified: trunk/sat-solver/package/libsatsolver.spec.in URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/package/libsatsolver.… ============================================================================== --- trunk/sat-solver/package/libsatsolver.spec.in (original) +++ trunk/sat-solver/package/libsatsolver.spec.in Sat Oct 25 11:24:50 2008 @@ -27,6 +27,12 @@ BuildRequires: check-devel Summary: A new approach to package dependency solving +#define some macros missing on fedora +%if 0%{?fedora_version} +%{!?py_sitedir: %define py_sitedir %(%{__python} -c "from distutils.sysconfig import get_python_lib()")} +%{!?py_requires: %define py_requires Requires: python} +%endif + %description A new approach to package dependency solving @@ -67,11 +73,7 @@ . %package -n python-satsolver -%if 0%{?fedora_version} -Requires: python -%else %py_requires -%endif Summary: Python bindings for sat solver Group: Development/Languages/Python -- 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] r11488 - /trunk/libzypp/zypp/base/LogControl.h
by coolo＠svn.opensuse.org 25 Oct '08

25 Oct '08

Author: coolo Date: Sat Oct 25 08:05:28 2008 New Revision: 11488 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11488&view=rev Log: define std::cout and std::cerr Modified: trunk/libzypp/zypp/base/LogControl.h Modified: trunk/libzypp/zypp/base/LogControl.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/base/LogControl.h?r… ============================================================================== --- trunk/libzypp/zypp/base/LogControl.h (original) +++ trunk/libzypp/zypp/base/LogControl.h Sat Oct 25 08:05:28 2008 @@ -13,6 +13,7 @@ #define ZYPP_BASE_LOGCONTROL_H #include <iosfwd> +#include <iostream> #include "zypp/base/Logger.h" #include "zypp/base/PtrTypes.h" -- 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] r11487 - in /trunk/libzypp: VERSION.cmake package/libzypp.changes tests/zypp/Fetcher_test.cc zypp/Fetcher.cc zypp/OnMediaLocation.h zypp/repo/yum/Downloader.cc
by mlandres＠svn.opensuse.org 24 Oct '08

24 Oct '08

Author: mlandres Date: Fri Oct 24 18:18:47 2008 New Revision: 11487 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11487&view=rev Log: Remove error prone methods from OnMediaLocation API to prevent accidental missuse. (bnc #437328) Modified: trunk/libzypp/VERSION.cmake trunk/libzypp/package/libzypp.changes trunk/libzypp/tests/zypp/Fetcher_test.cc trunk/libzypp/zypp/Fetcher.cc trunk/libzypp/zypp/OnMediaLocation.h trunk/libzypp/zypp/repo/yum/Downloader.cc Modified: trunk/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=11487&… ============================================================================== --- trunk/libzypp/VERSION.cmake (original) +++ trunk/libzypp/VERSION.cmake Fri Oct 24 18:18:47 2008 @@ -59,10 +59,10 @@ # changes file. See './mkChangelog -h' for help. # SET(LIBZYPP_MAJOR "5") -SET(LIBZYPP_COMPATMINOR "17") -SET(LIBZYPP_MINOR "18") +SET(LIBZYPP_COMPATMINOR "19") +SET(LIBZYPP_MINOR "19") SET(LIBZYPP_PATCH "0") # -# LAST RELEASED: 5.18.0 (17) +# LAST RELEASED: 5.19.0 (19) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= 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 Fri Oct 24 18:18:47 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Oct 24 18:12:34 CEST 2008 - ma(a)suse.de + +- Remove error prone methods from OnMediaLocation API to prevent + accidental missuse. (bnc #437328) +- revision 11487 +- version 5.19.0 (19) + +------------------------------------------------------------------- Fri Oct 24 16:07:45 CEST 2008 - ma(a)suse.de - Provide the /etc/products.d enties filename as Product::referenceFilename. 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 Fri Oct 24 18:18:47 2008 @@ -33,7 +33,7 @@ { filesystem::TmpDir dest; - fetcher.enqueueDir(OnMediaLocation().setFilename("/complexdir"), true); + fetcher.enqueueDir(OnMediaLocation("/complexdir"), true); BOOST_CHECK_THROW( fetcher.start( dest.path(), media ), Exception); fetcher.reset(); } @@ -44,14 +44,14 @@ // add the key as trusted getZYpp()->keyRing()->importKey(PublicKey(DATADIR + "/complexdir/subdir1/SHA1SUMS.key"), true); - fetcher.enqueueDir(OnMediaLocation().setFilename("/complexdir"), true); + fetcher.enqueueDir(OnMediaLocation("/complexdir"), true); fetcher.start( dest.path(), media ); BOOST_CHECK( PathInfo(dest.path() + "/complexdir/subdir2").isExist() ); BOOST_CHECK( PathInfo(dest.path() + "/complexdir/subdir2/subdir2-file1.txt").isExist() ); BOOST_CHECK( PathInfo(dest.path() + "/complexdir/subdir1/subdir1-file1.txt").isExist() ); BOOST_CHECK( PathInfo(dest.path() + "/complexdir/subdir1/subdir1-file2.txt").isExist() ); - + fetcher.reset(); } @@ -61,20 +61,20 @@ // add the key as trusted getZYpp()->keyRing()->importKey(PublicKey(DATADIR + "/complexdir-broken/subdir1/SHA1SUMS.key"), true); - fetcher.enqueueDir(OnMediaLocation().setFilename("/complexdir-broken"), true); - BOOST_CHECK_THROW( fetcher.start( dest.path(), media ), Exception); + fetcher.enqueueDir(OnMediaLocation("/complexdir-broken"), true); + BOOST_CHECK_THROW( fetcher.start( dest.path(), media ), Exception); fetcher.reset(); } - { + { filesystem::TmpDir dest; - fetcher.enqueue(OnMediaLocation().setFilename("/file-1.txt")); - fetcher.start( dest.path(), media ); + fetcher.enqueue(OnMediaLocation("/file-1.txt")); + fetcher.start( dest.path(), media ); BOOST_CHECK( PathInfo(dest.path() + "/file-1.txt").isExist() ); } - + //MIL << fetcher; } @@ -92,13 +92,13 @@ Fetcher fetcher; filesystem::TmpDir dest; - fetcher.enqueueDir(OnMediaLocation().setFilename("/complexdir"), true); + fetcher.enqueueDir(OnMediaLocation("/complexdir"), true); fetcher.start( dest.path(), media ); fetcher.reset(); - fetcher.enqueueDir(OnMediaLocation().setFilename("/complexdir-broken"), true); - BOOST_CHECK_THROW( fetcher.start( dest.path(), media ), Exception); + fetcher.enqueueDir(OnMediaLocation("/complexdir-broken"), true); + BOOST_CHECK_THROW( fetcher.start( dest.path(), media ), Exception); fetcher.reset(); Modified: trunk/libzypp/zypp/Fetcher.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Fetcher.cc?rev=1148… ============================================================================== --- trunk/libzypp/zypp/Fetcher.cc (original) +++ trunk/libzypp/zypp/Fetcher.cc Fri Oct 24 18:18:47 2008 @@ -35,7 +35,7 @@ */ struct FetcherJob { - + FetcherJob( const OnMediaLocation &loc ) : location(loc) , directory(false) @@ -53,7 +53,7 @@ //CompositeFileChecker checkers; list<FileChecker> checkers; bool directory; - bool recursive; + bool recursive; }; typedef shared_ptr<FetcherJob> FetcherJob_Ptr; @@ -77,7 +77,7 @@ ~Impl() { MIL << endl; } - + void enqueue( const OnMediaLocation &resource, const FileChecker &checker = FileChecker() ); void enqueueDir( const OnMediaLocation &resource, bool recursive, const FileChecker &checker = FileChecker() ); void enqueueDigested( const OnMediaLocation &resource, const FileChecker &checker = FileChecker() ); @@ -106,7 +106,7 @@ * \throws Exception */ void validate( const OnMediaLocation &resource, const Pathname &dest_dir, const list<FileChecker> &checkers ); - + /** * scan the directory and adds the individual jobs */ @@ -138,8 +138,8 @@ job->checkers.push_back(checker); _resources.push_back(job); } - - void Fetcher::Impl::enqueueDir( const OnMediaLocation &resource, + + void Fetcher::Impl::enqueueDir( const OnMediaLocation &resource, bool recursive, const FileChecker &checker ) { @@ -150,7 +150,7 @@ job->directory = true; job->recursive = recursive; _resources.push_back(job); - } + } void Fetcher::Impl::enqueue( const OnMediaLocation &resource, const FileChecker &checker ) { @@ -186,13 +186,13 @@ { ERR << "Not adding cache '" << cache_dir << "'. Path does not exists." << endl; } - + } bool Fetcher::Impl::provideFromCache( const OnMediaLocation &resource, const Pathname &dest_dir ) { Pathname dest_full_path = dest_dir + resource.filename(); - + // first check in the destination directory if ( PathInfo(dest_full_path).isExist() ) { @@ -200,7 +200,7 @@ && (! resource.checksum().empty() ) ) return true; } - + MIL << "start fetcher with " << _caches.size() << " cache directories." << endl; for_ ( it_cache, _caches.begin(), _caches.end() ) { @@ -240,7 +240,7 @@ } // iterate over caches return false; } - + void Fetcher::Impl::validate( const OnMediaLocation &resource, const Pathname &dest_dir, const list<FileChecker> &checkers ) { // no matter where did we got the file, try to validate it: @@ -261,7 +261,7 @@ ERR << "Invalid checker for '" << localfile << "'" << endl; } } - + } catch ( const FileCheckException &e ) { @@ -278,7 +278,7 @@ } void Fetcher::Impl::addDirJobs( MediaSetAccess &media, - const OnMediaLocation &resource, + const OnMediaLocation &resource, const Pathname &dest_dir, bool recursive ) { // first get the content of the directory so we can add @@ -286,12 +286,12 @@ MIL << "Adding directory " << resource.filename() << endl; filesystem::DirContent content; media.dirInfo( content, resource.filename(), false /* dots */, resource.medianr()); - + filesystem::DirEntry shafile, shasig, shakey; shafile.name = "SHA1SUMS"; shafile.type = filesystem::FT_FILE; shasig.name = "SHA1SUMS.asc"; shasig.type = filesystem::FT_FILE; shakey.name = "SHA1SUMS.key"; shakey.type = filesystem::FT_FILE; - + // create a new fetcher with a different state to transfer the // file containing checksums and its signature Fetcher fetcher; @@ -300,7 +300,7 @@ SignatureFileChecker sigchecker; // now try to find the SHA1SUMS signature - if ( find(content.begin(), content.end(), shasig) + if ( find(content.begin(), content.end(), shasig) != content.end() ) { MIL << "found checksums signature file: " << shasig.name << endl; @@ -317,7 +317,7 @@ MIL << "no signature for " << shafile.name << endl; // look for the SHA1SUMS.key file - if ( find(content.begin(), content.end(), shakey) + if ( find(content.begin(), content.end(), shakey) != content.end() ) { MIL << "found public key file: " << shakey.name << endl; @@ -330,19 +330,19 @@ } // look for the SHA1SUMS public key file - if ( find(content.begin(), content.end(), shafile) + if ( find(content.begin(), content.end(), shafile) != content.end() ) { MIL << "found checksums file: " << shafile.name << endl; fetcher.enqueue( OnMediaLocation(resource.filename() + shafile.name, resource.medianr()).setOptional(true) ); - assert_dir(dest_dir + resource.filename()); + assert_dir(dest_dir + resource.filename()); fetcher.start( dest_dir, media ); fetcher.reset(); } // hash table to store checksums map<string, CheckSum> checksums; - + // look for the SHA1SUMS file if ( find(content.begin(), content.end(), shafile) != content.end() ) { @@ -360,7 +360,7 @@ std::ifstream in( pShafile.c_str() ); string buffer; if ( ! in.fail() ) - { + { while ( getline(in, buffer) ) { vector<string> words; @@ -383,9 +383,9 @@ // skip SHA1SUMS* as they were already retrieved if ( str::hasPrefix(it->name, "SHA1SUMS") ) continue; - + Pathname filename = resource.filename() + it->name; - + switch ( it->type ) { case filesystem::FT_NOT_AVAIL: // old directory.yast contains no typeinfo at all @@ -394,15 +394,14 @@ CheckSum checksum; if ( checksums.find(it->name) != checksums.end() ) checksum = checksums[it->name]; - + // create a resource from the file // if checksum was not available we will have a empty // checksum, which will end in a validation anyway // warning the user that there is no checksum - enqueueDigested(OnMediaLocation() - .setFilename(filename) + enqueueDigested(OnMediaLocation(filename, resource.medianr()) .setChecksum(checksum)); - + break; } case filesystem::FT_DIR: // newer directory.yast contain at least directory info @@ -419,14 +418,14 @@ void Fetcher::Impl::provideToDest( MediaSetAccess &media, const OnMediaLocation &resource, const Pathname &dest_dir ) { bool got_from_cache = false; - + // start look in cache got_from_cache = provideFromCache(resource, dest_dir); - + if ( ! got_from_cache ) { MIL << "Not found in cache, downloading" << endl; - + // try to get the file from the net try { @@ -454,7 +453,7 @@ // continue with next file return; } - } + } void Fetcher::Impl::start( const Pathname &dest_dir, MediaSetAccess &media, @@ -464,7 +463,7 @@ progress.sendTo(progress_receiver); for ( list<FetcherJob_Ptr>::const_iterator it_res = _resources.begin(); it_res != _resources.end(); ++it_res ) - { + { if ( (*it_res)->directory ) { @@ -477,7 +476,7 @@ // validate job, this throws if not valid validate((*it_res)->location, dest_dir, (*it_res)->checkers); - + if ( ! progress.incr() ) ZYPP_THROW(AbortRequestException()); } // for each job @@ -487,7 +486,7 @@ inline std::ostream & operator<<( std::ostream & str, const Fetcher::Impl & obj ) { for ( list<FetcherJob_Ptr>::const_iterator it_res = obj._resources.begin(); it_res != obj._resources.end(); ++it_res ) - { + { str << *it_res; } return str; Modified: trunk/libzypp/zypp/OnMediaLocation.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/OnMediaLocation.h?r… ============================================================================== --- trunk/libzypp/zypp/OnMediaLocation.h (original) +++ trunk/libzypp/zypp/OnMediaLocation.h Fri Oct 24 18:18:47 2008 @@ -57,7 +57,7 @@ /** * media number where the resource is located. * for a url cd:// this could be 1..N. - * for a url of type http://host/path/CD1, a media number 2 + * for a url of type http://host/path/CD1, a media number 2 * means looking on http://host/path/CD1/../CD2 */ unsigned medianr() const { return _medianr; } @@ -124,7 +124,7 @@ OnMediaLocation & setOpenChecksum( const CheckSum & val_r ) { _openchecksum = val_r; return *this; } - /** + /** * Set the wether the resource is optional or not * \see optional */ @@ -132,34 +132,22 @@ { _optional = val; return *this; } public: - /** - * Individual manipulation of \c medianr. - * Using \ref setLocation is prefered. + /** + * Individual manipulation of \c medianr (prefer \ref setLocation). + * Using \ref setLocation is prefered as us usually have to adjust + * \c filename and \c medianr in sync. */ - OnMediaLocation & setMedianr( unsigned val_r ) + OnMediaLocation & changeMedianr( unsigned val_r ) { _medianr = val_r; return *this; } /** - * Individual manipulation of \c medianr. - * Use \ref setMediaNr instead - */ - ZYPP_DEPRECATED OnMediaLocation & changeMedianr( unsigned val_r ) - { return setMedianr(val_r); } - - /** - * Individual manipulation of \c filename. - * Using \ref setLocation is prefered. + * Individual manipulation of \c filename (prefer \ref setLocation). + * Using \ref setLocation is preferedas us usually have to adjust + * \c filename and \c medianr in sync. */ - OnMediaLocation &setFilename( const Pathname & val_r ) + OnMediaLocation & changeFilename( const Pathname & val_r ) { _filename = val_r; return *this; } - /** - * Individual manipulation of \c filename. - * Use \ref setFilename instead. - */ - ZYPP_DEPRECATED OnMediaLocation & changeFilename( const Pathname & val_r ) - { return setFilename(val_r); } - private: unsigned _medianr; Pathname _filename; Modified: trunk/libzypp/zypp/repo/yum/Downloader.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/yum/Downloader… ============================================================================== --- trunk/libzypp/zypp/repo/yum/Downloader.cc (original) +++ trunk/libzypp/zypp/repo/yum/Downloader.cc Fri Oct 24 18:18:47 2008 @@ -53,7 +53,7 @@ return loc; OnMediaLocation loc_with_path(loc); - loc_with_path.setFilename(prefix / loc.filename()); + loc_with_path.changeFilename(prefix / loc.filename()); return loc_with_path; } -- 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] r11486 - /trunk/libzypp/zypp/ZYppFactory.cc
by mlandres＠svn.opensuse.org 24 Oct '08

24 Oct '08

Author: mlandres Date: Fri Oct 24 17:24:37 2008 New Revision: 11486 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11486&view=rev Log: add missing translation Modified: trunk/libzypp/zypp/ZYppFactory.cc Modified: trunk/libzypp/zypp/ZYppFactory.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ZYppFactory.cc?rev=… ============================================================================== --- trunk/libzypp/zypp/ZYppFactory.cc (original) +++ trunk/libzypp/zypp/ZYppFactory.cc Fri Oct 24 17:24:37 2008 @@ -358,7 +358,7 @@ /*--------------------------------------------------*/ if ( globalLock.zyppLocked() ) { - std::string t = str::form(N_("System management is locked by the application with pid %d (%s).\n" + std::string t = str::form(_("System management is locked by the application with pid %d (%s).\n" "Close this application before trying again."), globalLock.locker_pid(), globalLock.locker_name().c_str() -- 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] r11485 - in /trunk/libzypp: VERSION.cmake libzypp.spec.cmake package/libzypp.changes zypp/Product.cc zypp/Product.h zypp/sat/SolvAttr.cc zypp/sat/SolvAttr.h zypp/target/TargetImpl.cc
by mlandres＠svn.opensuse.org 24 Oct '08

24 Oct '08

Author: mlandres Date: Fri Oct 24 16:10:31 2008 New Revision: 11485 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11485&view=rev Log: - Provide the /etc/products.d enties filename as Product::referenceFilename. Use it to remove orphan products. (bnc #432932) - Fix media exception handling in commit (bnc #395704) Modified: trunk/libzypp/VERSION.cmake trunk/libzypp/libzypp.spec.cmake trunk/libzypp/package/libzypp.changes trunk/libzypp/zypp/Product.cc trunk/libzypp/zypp/Product.h trunk/libzypp/zypp/sat/SolvAttr.cc trunk/libzypp/zypp/sat/SolvAttr.h trunk/libzypp/zypp/target/TargetImpl.cc Modified: trunk/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=11485&… ============================================================================== --- trunk/libzypp/VERSION.cmake (original) +++ trunk/libzypp/VERSION.cmake Fri Oct 24 16:10:31 2008 @@ -60,9 +60,9 @@ # SET(LIBZYPP_MAJOR "5") SET(LIBZYPP_COMPATMINOR "17") -SET(LIBZYPP_MINOR "17") +SET(LIBZYPP_MINOR "18") SET(LIBZYPP_PATCH "0") # -# LAST RELEASED: 5.17.0 (17) +# LAST RELEASED: 5.18.0 (17) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= Modified: trunk/libzypp/libzypp.spec.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/libzypp.spec.cmake?rev=1… ============================================================================== --- trunk/libzypp/libzypp.spec.cmake (original) +++ trunk/libzypp/libzypp.spec.cmake Fri Oct 24 16:10:31 2008 @@ -25,7 +25,7 @@ Obsoletes: yast2-packagemanager Recommends: logrotate BuildRequires: cmake -BuildRequires: libsatsolver-devel >= 0.12.0 openssl-devel +BuildRequires: libsatsolver-devel >= 0.12.1 openssl-devel BuildRequires: boost-devel curl-devel dejagnu doxygen gcc-c++ gettext-devel graphviz hal-devel libxml2-devel %if 0%{?suse_version} 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 Fri Oct 24 16:10:31 2008 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Fri Oct 24 16:07:45 CEST 2008 - ma(a)suse.de + +- Provide the /etc/products.d enties filename as Product::referenceFilename. + Use it to remove orphan products. (bnc #432932) +- Fix media exception handling in commit (bnc #395704) +- revision 11485 +- version 5.18.0 (17) + +------------------------------------------------------------------- Fri Oct 24 10:29:19 CEST 2008 - schubi(a)suse.de - Taking "unlock" instead of setTransact(false) in the solutions (bnc #436923) Modified: trunk/libzypp/zypp/Product.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Product.cc?rev=1148… ============================================================================== --- trunk/libzypp/zypp/Product.cc (original) +++ trunk/libzypp/zypp/Product.cc Fri Oct 24 16:10:31 2008 @@ -91,6 +91,9 @@ return sat::Solvable::noSolvable; } + std::string Product::referenceFilename() const + { return lookupStrAttribute( sat::SolvAttr::productReferenceFile ); } + Product::ReplacedProducts Product::replacedProducts() const { std::vector<constPtr> ret; Modified: trunk/libzypp/zypp/Product.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Product.h?rev=11485… ============================================================================== --- trunk/libzypp/zypp/Product.h (original) +++ trunk/libzypp/zypp/Product.h Fri Oct 24 16:10:31 2008 @@ -43,6 +43,11 @@ */ sat::Solvable referencePackage() const; + /** For installed products the name of the coddesponding + * \c /etc/products.d entry. + .*/ + std::string referenceFilename() const; + public: /***/ typedef std::vector<constPtr> ReplacedProducts; Modified: trunk/libzypp/zypp/sat/SolvAttr.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/SolvAttr.cc?rev… ============================================================================== --- trunk/libzypp/zypp/sat/SolvAttr.cc (original) +++ trunk/libzypp/zypp/sat/SolvAttr.cc Fri Oct 24 16:10:31 2008 @@ -98,6 +98,7 @@ const SolvAttr SolvAttr::extends ( SOLVABLE_EXTENDS ); // product + const SolvAttr SolvAttr::productReferenceFile ( PRODUCT_REFERENCEFILE ); const SolvAttr SolvAttr::productProductLine ( PRODUCT_PRODUCTLINE ); const SolvAttr SolvAttr::productShortlabel ( PRODUCT_SHORTLABEL ); const SolvAttr SolvAttr::productDistproduct ( PRODUCT_DISTPRODUCT ); Modified: trunk/libzypp/zypp/sat/SolvAttr.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/SolvAttr.h?rev=… ============================================================================== --- trunk/libzypp/zypp/sat/SolvAttr.h (original) +++ trunk/libzypp/zypp/sat/SolvAttr.h Fri Oct 24 16:10:31 2008 @@ -127,6 +127,7 @@ /** \name product */ //@{ + static const SolvAttr productReferenceFile; static const SolvAttr productProductLine; static const SolvAttr productShortlabel; static const SolvAttr productDistproduct; 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 Fri Oct 24 16:10:31 2008 @@ -683,16 +683,16 @@ bool abort = false; std::vector<sat::Solvable> successfullyInstalledPackages; - RepoProvidePackage repoProvidePackage( access, pool_r); // prepare the package cache. + RepoProvidePackage repoProvidePackage( access, pool_r ); CommitPackageCache packageCache( items_r.begin(), items_r.end(), root() / "tmp", repoProvidePackage ); - for (TargetImpl::PoolItemList::const_iterator it = items_r.begin(); it != items_r.end(); it++) + for ( TargetImpl::PoolItemList::const_iterator it = items_r.begin(); it != items_r.end(); it++ ) { - if (isKind<Package>(it->resolvable())) + if ( (*it)->isKind<Package>() ) { - Package::constPtr p = asKind<Package>(it->resolvable()); + Package::constPtr p = (*it)->asKind<Package>(); if (it->status().isToBeInstalled()) { ManagedFile localfile; @@ -706,15 +706,14 @@ WAR << "Skipping package " << p << " in commit" << endl; continue; } -#if 0 - // bnc #395704: missing catch causes abort. see if packageCache fails to handle - // errors correctly. catch ( const Exception &e ) { + // bnc #395704: missing catch causes abort. + // TODO see if packageCache fails to handle errors correctly. ZYPP_CAUGHT( e ); - SEC << e << endl; + INT << "Unexpected Error: Skipping package " << p << " in commit" << endl; + continue; } -#endif #warning Exception handling // create a installation progress report proxy @@ -813,15 +812,47 @@ progress.disconnect(); } } - else if (!policy_r.dryRun()) // other resolvables (non-Package) + else if ( ! policy_r.dryRun() ) // other resolvables (non-Package) { - if (it->buddy() == sat::Solvable()) - { - // Reset transaction only if this solvable has no buddy (Bug #417799) - // e.g. do not reset Products cause the concerning release package - // could not already be installed. - it->status().resetTransact( ResStatus::USER ); - } + // Status is changed as the buddy package buddy + // gets installed/deleted. Handle non-buddies only. + if ( ! it->buddy() ) + { + if ( (*it)->isKind<Product>() ) + { + Product::constPtr p = (*it)->asKind<Product>(); + if ( it->status().isToBeInstalled() ) + { + ERR << "Can't install orphan product without release-package! " << (*it) << endl; + } + else + { + // Deleting the corresponding product entry is all we con do. + // So the product will no longer be visible as installed. + std::string referenceFilename( p->referenceFilename() ); + if ( referenceFilename.empty() ) + { + ERR << "Can't remove orphan product without 'referenceFilename'! " << (*it) << endl; + } + else + { + PathInfo referenceFile( Pathname::assertprefix( _root, Pathname( "/etc/products.d" ) ) / referenceFilename ); + if ( ! referenceFile.isFile() || filesystem::unlink( referenceFile.path() ) != 0 ) + { + ERR << "Delete orphan product failed: " << referenceFile << endl; + } + } + } + } + else if ( (*it)->isKind<SrcPackage>() && it->status().isToBeInstalled() ) + { + // SrcPackage is install-only + SrcPackage::constPtr p = (*it)->asKind<SrcPackage>(); + installSrcPackage( p ); + } + + it->status().resetTransact( ResStatus::USER ); + } } // other resolvables } // for -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0