July 2007 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r6304 - /trunk/libzypp/devel/devel.aschnell/parse1.cc
by aschnell＠svn.opensuse.org 30 Jul '07

30 Jul '07

Author: aschnell Date: Mon Jul 30 17:54:57 2007 New Revision: 6304 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6304&view=rev Log: - simplification Modified: trunk/libzypp/devel/devel.aschnell/parse1.cc Modified: trunk/libzypp/devel/devel.aschnell/parse1.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.aschnell/par… ============================================================================== --- trunk/libzypp/devel/devel.aschnell/parse1.cc (original) +++ trunk/libzypp/devel/devel.aschnell/parse1.cc Mon Jul 30 17:54:57 2007 @@ -71,8 +71,7 @@ SEC << nrepo << endl; Repository nrep = repoManager.createFromCache( nrepo ); - const ResStore& store( nrep.resolvables() ); - getZYpp()->addResolvables( store ); + getZYpp()->addResolvables(nrep.resolvables()); } USR << "pool: " << pool << endl; -- 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] r6303 - in /trunk: libzypp-bindings/swig/Repository.i libzypp/zypp/Repository.h
by aschnell＠svn.opensuse.org 30 Jul '07

30 Jul '07

Author: aschnell Date: Mon Jul 30 17:50:17 2007 New Revision: 6303 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6303&view=rev Log: - removed superfluous namespace thingy Modified: trunk/libzypp-bindings/swig/Repository.i trunk/libzypp/zypp/Repository.h Modified: trunk/libzypp-bindings/swig/Repository.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/Repository… ============================================================================== --- trunk/libzypp-bindings/swig/Repository.i (original) +++ trunk/libzypp-bindings/swig/Repository.i Mon Jul 30 17:50:17 2007 @@ -1,13 +1,13 @@ class Repository : private base::SafeBool<Repository> { - public: +public: Repository(); static const Repository noRepository; - public: + typedef unsigned long NumericId; NumericId numericId() const; - const zypp::ResStore & resolvables(); + const ResStore & resolvables(); const RepoInfo info() const; const std::list<packagedelta::PatchRpm> & patchRpms() const; const std::list<packagedelta::DeltaRpm> & deltaRpms() const; Modified: trunk/libzypp/zypp/Repository.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Repository.h?rev=63… ============================================================================== --- trunk/libzypp/zypp/Repository.h (original) +++ trunk/libzypp/zypp/Repository.h Mon Jul 30 17:50:17 2007 @@ -62,7 +62,7 @@ /** * \short Get the resolvables for repo */ - const zypp::ResStore & resolvables() const; + const ResStore & resolvables() const; /** * \short Repository info used to create this repository -- 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] r6302 - /trunk/libzypp/package/libzypp.changes
by mlandres＠svn.opensuse.org 30 Jul '07

30 Jul '07

Author: mlandres Date: Mon Jul 30 17:19:11 2007 New Revision: 6302 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6302&view=rev Log: changes 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 Mon Jul 30 17:19:11 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Jul 30 17:23:19 CEST 2007 - ma(a)suse.de + +- Remove tribool from RepoInfo's interface. +- revision 6301 +- version 3.13.1 + +------------------------------------------------------------------- Mon Jul 30 13:59:33 CEST 2007 - ma(a)suse.de - Fixed wrong media number reported by script, message and patch. -- 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] r6301 - in /trunk/libzypp: ./ zypp/ zypp/parser/xmlstore/ zypp/repo/ zypp/target/store/
by mlandres＠svn.opensuse.org 30 Jul '07

30 Jul '07

Author: mlandres Date: Mon Jul 30 17:18:59 2007 New Revision: 6301 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6301&view=rev Log: - Remove tribool from RepoInfo's interface. Modified: trunk/libzypp/VERSION.cmake trunk/libzypp/zypp/RepoInfo.cc trunk/libzypp/zypp/RepoInfo.h trunk/libzypp/zypp/parser/xmlstore/XMLSourceCacheParser.cc trunk/libzypp/zypp/repo/ScriptProvider.cc trunk/libzypp/zypp/repo/ScriptProvider.h trunk/libzypp/zypp/target/store/serialize.cc Modified: trunk/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=6301&r… ============================================================================== --- trunk/libzypp/VERSION.cmake (original) +++ trunk/libzypp/VERSION.cmake Mon Jul 30 17:18:59 2007 @@ -47,4 +47,4 @@ SET(LIBZYPP_MAJOR "3") SET(LIBZYPP_MINOR "13") SET(LIBZYPP_COMPATMINOR "13") -SET(LIBZYPP_PATCH "0") +SET(LIBZYPP_PATCH "1") Modified: trunk/libzypp/zypp/RepoInfo.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/RepoInfo.cc?rev=630… ============================================================================== --- trunk/libzypp/zypp/RepoInfo.cc (original) +++ trunk/libzypp/zypp/RepoInfo.cc Mon Jul 30 17:18:59 2007 @@ -10,14 +10,12 @@ * */ #include <iostream> -#include <boost/logic/tribool_io.hpp> #include "zypp/base/Logger.h" #include "zypp/RepoInfo.h" using namespace std; -using namespace boost; /////////////////////////////////////////////////////////////////// namespace zypp @@ -32,9 +30,9 @@ { Impl() - : enabled (indeterminate), - autorefresh(indeterminate), - gpgcheck(indeterminate), + : enabled (false), + autorefresh(false), + gpgcheck(true), type(repo::RepoType::NONE_e) {} @@ -43,9 +41,9 @@ //MIL << std::endl; } public: - boost::tribool enabled; - boost::tribool autorefresh; - boost::tribool gpgcheck; + bool enabled; + bool autorefresh; + bool gpgcheck; Url gpgkey_url; repo::RepoType type; Url mirrorlist_url; @@ -96,19 +94,19 @@ //MIL << std::endl; } - RepoInfo & RepoInfo::setEnabled( boost::tribool enabled ) + RepoInfo & RepoInfo::setEnabled( bool enabled ) { _pimpl->enabled = enabled; return *this; } - RepoInfo & RepoInfo::setAutorefresh( boost::tribool autorefresh ) + RepoInfo & RepoInfo::setAutorefresh( bool autorefresh ) { _pimpl->autorefresh = autorefresh; return *this; } - - RepoInfo & RepoInfo::setGpgCheck( boost::tribool check ) + + RepoInfo & RepoInfo::setGpgCheck( bool check ) { _pimpl->gpgcheck = check; return *this; @@ -119,7 +117,7 @@ _pimpl->mirrorlist_url = url; return *this; } - + RepoInfo & RepoInfo::setGpgKeyUrl( const Url &url ) { _pimpl->gpgkey_url = url; @@ -144,7 +142,7 @@ _pimpl->path = path; return *this; } - + RepoInfo & RepoInfo::setAlias( const std::string &alias ) { _pimpl->alias = alias; @@ -168,20 +166,20 @@ _pimpl->filepath = filepath; return *this; } - + RepoInfo & RepoInfo::setMetadataPath( const Pathname &path ) { _pimpl->metadatapath = path; return *this; } - tribool RepoInfo::enabled() const + bool RepoInfo::enabled() const { return _pimpl->enabled; } - tribool RepoInfo::autorefresh() const + bool RepoInfo::autorefresh() const { return _pimpl->autorefresh; } - - tribool RepoInfo::gpgCheck() const + + bool RepoInfo::gpgCheck() const { return _pimpl->gpgcheck; } std::string RepoInfo::alias() const @@ -195,13 +193,13 @@ Pathname RepoInfo::metadataPath() const { return _pimpl->metadatapath; } - + repo::RepoType RepoInfo::type() const { return _pimpl->type; } Url RepoInfo::mirrorListUrl() const { return _pimpl->mirrorlist_url; } - + Url RepoInfo::gpgKeyUrl() const { return _pimpl->gpgkey_url; } @@ -210,7 +208,7 @@ Pathname RepoInfo::path() const { return _pimpl->path; } - + RepoInfo::urls_const_iterator RepoInfo::baseUrlsBegin() const { return _pimpl->baseUrls.begin(); } @@ -237,11 +235,11 @@ str << "- path : " << path() << std::endl; str << "- type : " << type() << std::endl; str << "- enabled : " << enabled() << std::endl; - + str << "- autorefresh : " << autorefresh() << std::endl; str << "- gpgcheck : " << gpgCheck() << std::endl; str << "- gpgkey : " << gpgKeyUrl() << std::endl; - + return str; } @@ -258,21 +256,17 @@ { str << *it << endl; } - + if ( ! path().empty() ) str << "path="<< path() << endl; - + if ( ! (mirrorListUrl().asString().empty()) ) str << "mirrorlist=" << mirrorListUrl() << endl; - + str << "type=" << type().asString() << endl; - - if ( ! indeterminate(enabled()) ) - str << "enabled=" << (enabled() ? "1" : "0") << endl; - if ( ! indeterminate(autorefresh()) ) - str << "autorefresh=" << (autorefresh() ? "1" : "0") << endl; - if ( ! indeterminate(gpgCheck()) ) - str << "gpgcheck=" << (gpgCheck() ? "1" : "0") << endl; + str << "enabled=" << (enabled() ? "1" : "0") << endl; + str << "autorefresh=" << (autorefresh() ? "1" : "0") << endl; + str << "gpgcheck=" << (gpgCheck() ? "1" : "0") << endl; if ( ! (gpgKeyUrl().asString().empty()) ) str << "gpgkey=" <<gpgKeyUrl() << endl; Modified: trunk/libzypp/zypp/RepoInfo.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/RepoInfo.h?rev=6301… ============================================================================== --- trunk/libzypp/zypp/RepoInfo.h (original) +++ trunk/libzypp/zypp/RepoInfo.h Mon Jul 30 17:18:59 2007 @@ -17,12 +17,10 @@ #include <set> #include "zypp/base/PtrTypes.h" -#include <boost/logic/tribool.hpp> #include "zypp/Pathname.h" #include "zypp/Url.h" #include "zypp/repo/RepoType.h" - /////////////////////////////////////////////////////////////////// namespace zypp { ///////////////////////////////////////////////////////////////// @@ -67,7 +65,6 @@ public: RepoInfo(); ~RepoInfo(); - //RepoInfo( const Url & url, const Pathname & path, const std::string & alias = "", boost::tribool autorefresh = boost::indeterminate ); typedef unsigned long NumericId; @@ -110,7 +107,7 @@ * */ Pathname path() const; - + /** * Url of a file which contains a list of Urls * If empty, the base url will be used. @@ -144,13 +141,13 @@ * If enabled is false, then this repository must be ignored as if does * not exists, except when checking for duplicate alias. */ - boost::tribool enabled() const; + bool enabled() const; /** * If true, the repostory must be refreshed before creating resolvables * from it */ - boost::tribool autorefresh() const; + bool autorefresh() const; /** * Type of repository, @@ -174,7 +171,7 @@ * infos created in memory. */ Pathname filepath() const; - + /** * \short Path where this repo metadata was read from * @@ -182,7 +179,7 @@ * infos created in memory. */ Pathname metadataPath() const; - + /** * \short Whether to check or not this repository with gpg * @@ -190,7 +187,7 @@ * be ignored. * */ - boost::tribool gpgCheck() const; + bool gpgCheck() const; /** * \short Key to use for gpg checking of this repository @@ -202,7 +199,7 @@ * */ Url gpgKeyUrl() const; - + /** * Add a base url. \see baseUrls * \param url The base url for the repository. @@ -222,7 +219,7 @@ * \param path the path to the product */ RepoInfo & setPath( const Pathname &path ); - + /** * Set mirror list url. \see mirrorListUrl * \param url The base url for the list @@ -233,13 +230,13 @@ * enable or disable the repository \see enabled * \param enabled */ - RepoInfo & setEnabled( boost::tribool enabled ); + RepoInfo & setEnabled( bool enabled ); /** * enable or disable autorefresh \see autorefresh * \param enabled */ - RepoInfo & setAutorefresh( boost::tribool autorefresh ); + RepoInfo & setAutorefresh( bool autorefresh ); /** * set the repository alias \see alias @@ -268,7 +265,7 @@ * \param path File path */ RepoInfo & setFilepath( const Pathname &filename ); - + /** * \short set the path where the local metadata is stored * @@ -288,8 +285,8 @@ * be ignored. * */ - RepoInfo & setGpgCheck( boost::tribool check ); - + RepoInfo & setGpgCheck( bool check ); + /** * \short Key to use for gpg checking of this repository * @@ -300,7 +297,7 @@ * */ RepoInfo & setGpgKeyUrl( const Url &gpgkey ); - + /** * Write a human-readable representation of this RepoInfo object * into the \a str stream. Useful for logging. Modified: trunk/libzypp/zypp/parser/xmlstore/XMLSourceCacheParser.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/parser/xmlstore/XML… ============================================================================== --- trunk/libzypp/zypp/parser/xmlstore/XMLSourceCacheParser.cc (original) +++ trunk/libzypp/zypp/parser/xmlstore/XMLSourceCacheParser.cc Mon Jul 30 17:18:59 2007 @@ -66,8 +66,6 @@ dataPtr->setEnabled(true); else if ( (_helper.content(child) == "false") || (_helper.content(child) == "0") ) dataPtr->setEnabled(false); - else - dataPtr->setEnabled(boost::indeterminate); } else if (name == "auto-refresh") { @@ -75,8 +73,6 @@ dataPtr->setAutorefresh(true); else if ( (_helper.content(child) == "false") || (_helper.content(child) == "0") ) dataPtr->setAutorefresh(false); - else - dataPtr->setAutorefresh(boost::indeterminate); } else if (name == "type") { Modified: trunk/libzypp/zypp/repo/ScriptProvider.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/ScriptProvider… ============================================================================== --- trunk/libzypp/zypp/repo/ScriptProvider.cc (original) +++ trunk/libzypp/zypp/repo/ScriptProvider.cc Mon Jul 30 17:18:59 2007 @@ -15,7 +15,7 @@ #include "zypp/repo/ScriptProvider.h" using std::endl; -#warning IMPLEMENT IT + /////////////////////////////////////////////////////////////////// namespace zypp { ///////////////////////////////////////////////////////////////// @@ -24,19 +24,23 @@ { ///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////// - // - // CLASS NAME : ScriptProvider::Impl - // - /** ScriptProvider implementation. */ - struct ScriptProvider::Impl - { - }; - /////////////////////////////////////////////////////////////////// + namespace + { ///////////////////////////////////////////////////////////////// - /////////////////////////////////////////////////////////////////// - // - // CLASS NAME : ScriptProvider - // + typedef std::string (Script::*inlined)() const; + typedef OnMediaLocation (Script::*location)() const; + + /** Provide a Script in a local file. */ + ManagedFile doProvideScript( repo::RepoMediaAccess & access_r, + const Script & script_r, + inlined inlined_r, location location_r ) + { + ManagedFile ret; + return ret; + } + + ///////////////////////////////////////////////////////////////// + } // namespace /////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////// @@ -46,7 +50,8 @@ // ScriptProvider::ScriptProvider( repo::RepoMediaAccess & access_r, const Script::constPtr & script_r ) - //: _pimpl( ) + : _access( access_r ) + , _script( script_r ) { // ManagedFile provideFile( Repository repo_r, // const OnMediaLocation & loc_r, @@ -63,12 +68,26 @@ ManagedFile ScriptProvider::provideDoScript() const { - return ManagedFile(); + ManagedFile ret; + if ( _script ) + { + return doProvideScript( _access, *_script, + &Script::doScriptInlined, + &Script::doScriptLocation ); + } + return ret; } ManagedFile ScriptProvider::provideUndoScript() const { - return ManagedFile(); + ManagedFile ret; + if ( _script ) + { + return doProvideScript( _access, *_script, + &Script::undoScriptInlined, + &Script::undoScriptLocation ); + } + return ret; } ///////////////////////////////////////////////////////////////// Modified: trunk/libzypp/zypp/repo/ScriptProvider.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/ScriptProvider… ============================================================================== --- trunk/libzypp/zypp/repo/ScriptProvider.h (original) +++ trunk/libzypp/zypp/repo/ScriptProvider.h Mon Jul 30 17:18:59 2007 @@ -14,7 +14,9 @@ #include <iosfwd> +#include "zypp/base/NonCopyable.h" #include "zypp/base/PtrTypes.h" + #include "zypp/repo/RepoProvideFile.h" #include "zypp/ManagedFile.h" #include "zypp/Script.h" @@ -33,13 +35,9 @@ // CLASS NAME : ScriptProvider // /** */ - class ScriptProvider + class ScriptProvider : private base::NonCopyable { public: - /** Implementation */ - class Impl; - - public: /** Ctor */ ScriptProvider( repo::RepoMediaAccess & access_r, const Script::constPtr & script_r ); @@ -62,8 +60,8 @@ ManagedFile provideUndoScript() const; private: - /** Pointer to implementation */ - RW_pointer<Impl> _pimpl; + RepoMediaAccess & _access; + Script::constPtr _script; }; /////////////////////////////////////////////////////////////////// Modified: trunk/libzypp/zypp/target/store/serialize.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/target/store/serial… ============================================================================== --- trunk/libzypp/zypp/target/store/serialize.cc (original) +++ trunk/libzypp/zypp/target/store/serialize.cc Mon Jul 30 17:18:59 2007 @@ -15,6 +15,8 @@ #include <sstream> #include <streambuf> +#include <boost/logic/tribool.hpp> + #include "zypp/base/Logger.h" #include "zypp/CapFactory.h" #include "zypp/Url.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] r6300 - /trunk/zypper/package/zypper.changes
by jkupec＠svn.opensuse.org 30 Jul '07

30 Jul '07

Author: jkupec Date: Mon Jul 30 17:05:17 2007 New Revision: 6300 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6300&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 Mon Jul 30 17:05:17 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jul 30 17:03:42 CEST 2007 - jkupec(a)suse.cz + +- fixed proper error message if a repo is invalid (#294483,#294488) +- r6298 + +------------------------------------------------------------------- Mon Jul 30 14:27:25 CEST 2007 - jkupec(a)suse.cz - output functions for progress reporting now take ostream as argument -- 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] r6299 - /trunk/libzypp/devel/devel.aschnell/parse1.cc
by aschnell＠svn.opensuse.org 30 Jul '07

30 Jul '07

Author: aschnell Date: Mon Jul 30 16:54:11 2007 New Revision: 6299 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6299&view=rev Log: - cleanup Modified: trunk/libzypp/devel/devel.aschnell/parse1.cc Modified: trunk/libzypp/devel/devel.aschnell/parse1.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.aschnell/par… ============================================================================== --- trunk/libzypp/devel/devel.aschnell/parse1.cc (original) +++ trunk/libzypp/devel/devel.aschnell/parse1.cc Mon Jul 30 16:54:11 2007 @@ -71,7 +71,7 @@ SEC << nrepo << endl; Repository nrep = repoManager.createFromCache( nrepo ); - const zypp::ResStore& store( nrep.resolvables() ); + const ResStore& store( nrep.resolvables() ); getZYpp()->addResolvables( store ); } -- 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] r6298 - in /trunk/zypper/src: zypper-misc.cc zypper-sources.cc
by jkupec＠svn.opensuse.org 30 Jul '07

30 Jul '07

Author: jkupec Date: Mon Jul 30 16:52:47 2007 New Revision: 6298 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6298&view=rev Log: - fixed proper error message if a repo is invalid (#294483) Modified: trunk/zypper/src/zypper-misc.cc trunk/zypper/src/zypper-sources.cc Modified: trunk/zypper/src/zypper-misc.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-misc.cc?rev=62… ============================================================================== --- trunk/zypper/src/zypper-misc.cc (original) +++ trunk/zypper/src/zypper-misc.cc Mon Jul 30 16:52:47 2007 @@ -472,6 +472,7 @@ it != gData.repos.end(); ++it) { RepoInfo repo(*it); + MIL << "Loading " << repo.alias() << " resolvables." << endl; if (! it->enabled()) continue; // #217297 @@ -499,10 +500,14 @@ repository = manager.createFromCache(repo); ResStore store = repository.resolvables(); - cout_v << " " << format(_("(%d resolvables found)")) % store.size(); + cout_v << " " << format(_("(%d resolvables found)")) % store.size() << endl; God->addResolvables(store); } + catch (const repo::RepoMetadataException & ex) + { + cerr << _("asdf") << endl; + } catch (const Exception & e) { ZYPP_CAUGHT(e); Modified: trunk/zypper/src/zypper-sources.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-sources.cc?rev… ============================================================================== --- trunk/zypper/src/zypper-sources.cc (original) +++ trunk/zypper/src/zypper-sources.cc Mon Jul 30 16:52:47 2007 @@ -37,17 +37,34 @@ it != gData.repos.end(); ++it) { RepoInfo repo(*it); + MIL << "initializing " << repo.alias() << endl; //! \todo honor command line options/commands bool do_refresh = repo.enabled() && repo.autorefresh(); if (do_refresh) { - //! \todo progress reporting cout_v << format( _("Checking whether to refresh metadata for %s.")) % repo.alias() << endl; - manager.refreshMetadata(repo); + MIL << "calling refresh for " << repo.alias() << endl; + + try { manager.refreshMetadata(repo); } + catch (const RepoException & ex) + { + cerr << format(_("Repository %s is invalid.")) % repo.alias() << endl; + cerr_v << _("Reason: ") << ex.asUserString() << endl; + ERR << repo.alias() << " is invalid, disabling it" << endl; + it->setEnabled(false); + } + catch (const Exception & ex) + { + cerr << format(_("Error while refreshing repository %s:")) % repo.alias() + << endl; + cerr << ex.asUserString() << endl; + ERR << "Error while refreshing " << repo.alias() << ", disabling it" << endl; + it->setEnabled(false); + } } } } -- 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] r6297 - /trunk/libzypp/devel/devel.aschnell/parse1.cc
by aschnell＠svn.opensuse.org 30 Jul '07

30 Jul '07

Author: aschnell Date: Mon Jul 30 16:45:06 2007 New Revision: 6297 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6297&view=rev Log: - cleanup Modified: trunk/libzypp/devel/devel.aschnell/parse1.cc Modified: trunk/libzypp/devel/devel.aschnell/parse1.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.aschnell/par… ============================================================================== --- trunk/libzypp/devel/devel.aschnell/parse1.cc (original) +++ trunk/libzypp/devel/devel.aschnell/parse1.cc Mon Jul 30 16:45:06 2007 @@ -42,10 +42,6 @@ RepoManager repoManager (opts); - RepoInfoList repos = repoManager.knownRepositories(); - if ( !repos.empty() ) - ERR << "repos not empty" << endl; - RepoInfo nrepo; nrepo.setAlias( "factorytest" ) .setName( "Test Repo for factory." ) @@ -56,17 +52,12 @@ // .addBaseUrl(Url("file:///ARVIN/zypp/trunk/repotools/")); repoManager.addRepository( nrepo ); - repos = repoManager.knownRepositories(); - - SEC << "refreshMetadata" << endl; - repoManager.refreshMetadata( nrepo ); - SEC << "buildCache" << endl; - repoManager.buildCache( nrepo ); ResPool pool( getZYpp()->pool() ); USR << "pool: " << pool << endl; + RepoInfoList repos = repoManager.knownRepositories(); for ( RepoInfoList::iterator it = repos.begin(); it != repos.end(); it++ ) { RepoInfo& nrepo( *it ); @@ -79,7 +70,7 @@ // here SQLite is upto-date SEC << nrepo << endl; - Repository nrep( repoManager.createFromCache( nrepo ) ); + Repository nrep = repoManager.createFromCache( nrepo ); const zypp::ResStore& store( nrep.resolvables() ); getZYpp()->addResolvables( store ); } -- 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] r6296 - in /trunk/updater-kde/package: opensuse-updater-kde.changes opensuse-updater-kde.spec
by tgoettlicher＠svn.opensuse.org 30 Jul '07

30 Jul '07

Author: tgoettlicher Date: Mon Jul 30 16:33:34 2007 New Revision: 6296 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6296&view=rev Log: (empty) Modified: trunk/updater-kde/package/opensuse-updater-kde.changes trunk/updater-kde/package/opensuse-updater-kde.spec Modified: trunk/updater-kde/package/opensuse-updater-kde.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/package/opensuse-upd… ============================================================================== --- trunk/updater-kde/package/opensuse-updater-kde.changes (original) +++ trunk/updater-kde/package/opensuse-updater-kde.changes Mon Jul 30 16:33:34 2007 @@ -1,3 +1,7 @@ +Thu Jul 30 16:32:00 CEST 2007 - tgoettlicher(a)suse.de + +- add recurring notification + ------------------------------------------------------------------- Thu Jul 12 15:14:29 CEST 2007 - coolo(a)suse.de Modified: trunk/updater-kde/package/opensuse-updater-kde.spec URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/package/opensuse-upd… ============================================================================== --- trunk/updater-kde/package/opensuse-updater-kde.spec (original) +++ trunk/updater-kde/package/opensuse-updater-kde.spec Mon Jul 30 16:33:34 2007 @@ -87,6 +87,8 @@ /opt/kde3/share/locale %changelog -n opensuse-updater-kde +* Fri Jul 30 2006 - tgoettlicher(a)novell.com +- add recurring notification * Fri Jul 27 2006 - tgoettlicher(a)novell.com - complete rewrite * Wed Aug 30 2006 - stbinner(a)suse.de -- 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] r6295 - in /trunk/updater-kde: ./ po/ updater/
by tgoettlicher＠svn.opensuse.org 30 Jul '07

30 Jul '07

Author: tgoettlicher Date: Mon Jul 30 16:11:53 2007 New Revision: 6295 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6295&view=rev Log: added recurring notification when updates exist (#292556) Added: trunk/updater-kde/po/createPot (with props) trunk/updater-kde/po/opensuseupdater.pot Modified: trunk/updater-kde/opensuse-updater-kde.spec.in trunk/updater-kde/updater/ConfigWidgetUI.h trunk/updater-kde/updater/ConfigWidgetUI.ui trunk/updater-kde/updater/TrayIcon.cpp trunk/updater-kde/updater/TrayIcon.h trunk/updater-kde/updater/opensuseupdater_settings.kcfg Modified: trunk/updater-kde/opensuse-updater-kde.spec.in URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/opensuse-updater-kde… ============================================================================== --- trunk/updater-kde/opensuse-updater-kde.spec.in (original) +++ trunk/updater-kde/opensuse-updater-kde.spec.in Mon Jul 30 16:11:53 2007 @@ -20,7 +20,7 @@ URL: http://en.opensuse.org/KDE_Updater_Applet BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 -Requires: zypper >= 0.5.3 +Requires: zypper >= 0.8.4 Obsoletes: opensuse-updater Conflicts: opensuse-updater @@ -32,6 +32,7 @@ Narayan Newton <narayannewton(a)gmail.com> Duncan Mac-Vicar <dmacvicar(a)novell.com> Martin Vidner <mvidner(a)novell.com> + Thomas Goettlicher <tgoettlicher_at_novell.com> %prep %setup -q -n %{name}-%{version} @@ -88,3 +89,6 @@ - fix build * Tue Aug 29 2006 - dmacvicar(a)suse.de - revision 390 + + + Added: trunk/updater-kde/po/createPot URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/po/createPot?rev=629… ============================================================================== --- trunk/updater-kde/po/createPot (added) +++ trunk/updater-kde/po/createPot Mon Jul 30 16:11:53 2007 @@ -0,0 +1,12 @@ +#!/bin/bash + +# search for sourcecode-files +SRCFILES=`find .. -type d -name testsuite -prune , \ + -type f -name "*.h" \ + -o -name "*.pm" \ + -o -name "*.c" \ + -o -name "*.cc" \ + -o -name "*.cpp"` +echo $SRCFILES +#calling xgettext with the sourcefiles +xgettext --no-wrap --add-comments --add-location --keyword=i18n --keyword=_ --keyword=_:1,2 --keyword=__ --keyword=N_ --foreign-user --copyright-holder="SuSE Linux Products GmbH, Nuernberg" --default-domain=libzypp --output=opensuseupdater.pot $SRCFILES Added: trunk/updater-kde/po/opensuseupdater.pot URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/po/opensuseupdater.p… ============================================================================== --- trunk/updater-kde/po/opensuseupdater.pot (added) +++ trunk/updater-kde/po/opensuseupdater.pot Mon Jul 30 16:11:53 2007 @@ -0,0 +1,575 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2007-07-12 19:46-0400\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../kxmlrpcclient/kxmlrpcquery.cpp:131 +msgid "Received invalid XML markup: %1 at %2:%3" +msgstr "" + +#: ../kxmlrpcclient/kxmlrpcquery.cpp:141 +msgid "Unknown type of XML markup received" +msgstr "" + +#: ../udshttp/udshttp.cpp:128 +msgid "There were errors getting data from job" +msgstr "" + +#: ../udshttp/udshttp.cpp:270 +msgid "Timeout on server" +msgstr "" + +#: ../udshttp/udshttp.cpp:285 +msgid "Bad url" +msgstr "" + +#: ../udshttp/udshttp.cpp:392 +msgid "Unauthorized access" +msgstr "" + +#: ../udshttp/udshttp.cpp:395 ../udshttp/udshttp.cpp:397 +msgid "URL Invalid" +msgstr "" + +#: ../udshttp/udshttp.cpp:400 +msgid "Server Error" +msgstr "" + +#: ../udshttp/udshttp.cpp:403 +msgid "Service unavailable" +msgstr "" + +#: ../updater/simpleview.cpp:37 ../updater/simpleview.cpp:183 +msgid "New software for your system is available" +msgstr "" + +#: ../updater/simpleview.cpp:46 +msgid "Choose the updates to be installed:" +msgstr "" + +#: ../updater/simpleview.cpp:48 ../updater/simpleview.cpp:188 +msgid "Install %1 recommeded updates additionally" +msgstr "" + +#: ../updater/simpleview.cpp:49 +msgid "Don't install updates that require a restart" +msgstr "" + +#. -------------------- Buttons ------------------------ +#: ../updater/simpleview.cpp:61 +msgid "Details ..." +msgstr "" + +#: ../updater/simpleview.cpp:65 ../updater/osupdaterpopup.cpp:73 +#: ../updater/MainWindow.cpp:81 ../updater/MainWindow.cpp:207 +msgid "Install" +msgstr "" + +#: ../updater/simpleview.cpp:66 +msgid "Close" +msgstr "" + +#: ../updater/simpleview.cpp:146 +msgid "Checking for updates..." +msgstr "" + +#: ../updater/simpleview.cpp:158 +msgid "Error:" +msgstr "" + +#: ../updater/simpleview.cpp:170 +msgid "No Updates Available" +msgstr "" + +#: ../updater/simpleview.cpp:184 +msgid "%1 security updates are available" +msgstr "" + +#: ../updater/simpleview.cpp:207 +msgid "Updating..." +msgstr "" + +#: ../updater/zypp/ZYppUpdater.cpp:112 ../updater/zypp/ZYppUpdater.cpp:114 +#: ../updater/zypp_traditional/ZYppUpdater.cpp:131 +#: ../updater/zypp_traditional/ZYppUpdater.cpp:133 +msgid "" +"helper program returned:\n" +"%1" +msgstr "" + +#: ../updater/zypp/ZYppUpdater.cpp:230 +#: ../updater/zypp_traditional/ZYppUpdater.cpp:233 +msgid "Can't launch zypp-checkpatches-wrapper helper program. Make sure zypper package is installed and working." +msgstr "" + +#: ../updater/zypp/ZYppUpdater.cpp:331 +msgid "Can't launch install helper program. Make sure zypper package is installed and working." +msgstr "" + +#: ../updater/progresspopup.cpp:25 +msgid "Updating ..." +msgstr "" + +#: ../updater/osupdaterpopup.cpp:74 +msgid "Ignore" +msgstr "" + +#: ../updater/osupdaterpopup.cpp:75 +msgid "Details..." +msgstr "" + +#: ../updater/osupdaterpopup.cpp:102 +msgid "1 Patch available" +msgstr "" + +#: ../updater/osupdaterpopup.cpp:105 +msgid "%1 Patches available" +msgstr "" + +#: ../updater/osupdaterpopup.cpp:108 +msgid "1 Package available" +msgstr "" + +#: ../updater/osupdaterpopup.cpp:111 +msgid "%1 Packages available" +msgstr "" + +#: ../updater/osupdaterpopup.cpp:114 +msgid "1 Patch and 1 Package available" +msgstr "" + +#: ../updater/osupdaterpopup.cpp:117 +msgid "%1 Patches and 1 Package available" +msgstr "" + +#: ../updater/osupdaterpopup.cpp:120 +msgid "1 Patch and %1 Packages available" +msgstr "" + +#: ../updater/osupdaterpopup.cpp:123 +msgid "%1 Patches and %2 Packages available" +msgstr "" + +#: ../updater/MainWindow.cpp:78 ../updater/MainWindow.cpp:204 +msgid "Add/Remove Update Sources..." +msgstr "" + +#: ../updater/MainWindow.cpp:79 +msgid "Configure Applet..." +msgstr "" + +#: ../updater/MainWindow.cpp:80 +msgid "Check Now" +msgstr "" + +#: ../updater/MainWindow.cpp:120 +msgid "Available Updates: The following are software upgrades and patches to add features and fix bugs. " +msgstr "" + +#: ../updater/MainWindow.cpp:129 +msgid "The following are software patches to fix bugs." +msgstr "" + +#: ../updater/MainWindow.cpp:131 ../updater/MainWindow.cpp:169 +msgid "Name" +msgstr "" + +#: ../updater/MainWindow.cpp:133 ../updater/MainWindow.cpp:171 +msgid "Summary" +msgstr "" + +#: ../updater/MainWindow.cpp:134 ../updater/MainWindow.cpp:172 +msgid "Type" +msgstr "" + +#: ../updater/MainWindow.cpp:135 ../updater/MainWindow.cpp:173 +msgid "New Version" +msgstr "" + +#: ../updater/MainWindow.cpp:136 ../updater/MainWindow.cpp:174 +msgid "Catalog" +msgstr "" + +#: ../updater/MainWindow.cpp:137 ../updater/MainWindow.cpp:175 +msgid "Size" +msgstr "" + +#: ../updater/MainWindow.cpp:138 ../updater/MainWindow.cpp:176 +msgid "Restart" +msgstr "" + +#: ../updater/MainWindow.cpp:143 ../updater/MainWindow.cpp:384 +msgid "Patches" +msgstr "" + +#: ../updater/MainWindow.cpp:148 +msgid "Select All Patches" +msgstr "" + +#: ../updater/MainWindow.cpp:149 +msgid "Clear Patch Selection" +msgstr "" + +#: ../updater/MainWindow.cpp:167 +msgid "For experts only! The following are software upgrades to add features." +msgstr "" + +#: ../updater/MainWindow.cpp:185 +msgid "Select All Packages" +msgstr "" + +#: ../updater/MainWindow.cpp:186 +msgid "Clear Package Selection" +msgstr "" + +#: ../updater/MainWindow.cpp:193 ../updater/MainWindow.cpp:385 +msgid "Upgrades" +msgstr "" + +#: ../updater/MainWindow.cpp:242 +msgid "Available Updates" +msgstr "" + +#: ../updater/MainWindow.cpp:460 +msgid "Settings" +msgstr "" + +#: ../updater/zmd/ZmdUpdater.cpp:153 +msgid "Hold Back Package" +msgstr "" + +#: ../updater/zmd/ZmdUpdater.cpp:157 +msgid "Don't Hold Back Package" +msgstr "" + +#: ../updater/zmd/ZmdUpdater.cpp:372 +msgid "Update" +msgstr "" + +#: ../updater/zmd/ZmdUpdater.cpp:410 +#: ../updater/zypp_traditional/ZYppUpdater.cpp:165 +msgid "Patch" +msgstr "" + +#: ../updater/zmd/ZmdUpdater.cpp:457 ../updater/zmd/ZmdUpdater.cpp:471 +msgid "Description: " +msgstr "" + +#: ../updater/zmd/ZmdUpdater.cpp:459 +msgid "Upgrading from old version: " +msgstr "" + +#: ../updater/zmd/ZmdUpdater.cpp:470 +msgid "Patch Category: " +msgstr "" + +#: ../updater/zmd/ZmdUpdater.cpp:473 +msgid "Upgrading to version: " +msgstr "" + +#: ../updater/zmd/ZmdUpdater.cpp:477 +msgid "Reboot Required" +msgstr "" + +#: ../updater/zmd/ZmdUpdater.cpp:482 +msgid "ZMD Restart Required" +msgstr "" + +#: ../updater/zmd/ZmdEditServers.cpp:53 ../updater/zmd/ZmdServerDialog.cpp:124 +msgid "Add Server" +msgstr "" + +#: ../updater/zmd/ZmdEditServers.cpp:54 +msgid "Remove Server" +msgstr "" + +#: ../updater/zmd/ZmdEditServers.cpp:56 +msgid "Services/Catalogs" +msgstr "" + +#. Tell the user what is going on +#: ../updater/zmd/ZmdEditServers.cpp:99 +msgid "Fetching service list..." +msgstr "" + +#: ../updater/zmd/ZmdEditServers.cpp:141 +msgid "Fetching Catalogs For Service..." +msgstr "" + +#. Tell the user what is going on, this takes a long long time +#: ../updater/zmd/ZmdEditServers.cpp:218 +msgid "Adding server.." +msgstr "" + +#: ../updater/zmd/ZmdEditServers.cpp:219 +msgid "" +"We are adding a server to the updater, this may take a long time. \n" +"Please be patient" +msgstr "" + +#. We don't say you need to have a type, because the groupbox takes care of that +#: ../updater/zmd/ZmdEditServers.cpp:231 +msgid "You need to specify a name and URL to add a server" +msgstr "" + +#: ../updater/zmd/ZmdEditServers.cpp:248 +msgid "Invalid server: " +msgstr "" + +#: ../updater/zmd/ZmdEditServers.cpp:251 +msgid "The type you specified for the server is invalid:" +msgstr "" + +#: ../updater/zmd/ZmdEditServers.cpp:254 +msgid "Sorry, the server could not be added: " +msgstr "" + +#: ../updater/zmd/ZmdEditServers.cpp:281 +msgid "Service Removed" +msgstr "" + +#: ../updater/zmd/ZmdAdvancedConfig.cpp:75 +msgid "To use this part of the updater, rug must be in your path" +msgstr "" + +#: ../updater/zmd/ZmdAdvancedConfig.cpp:85 +msgid "Connection Options" +msgstr "" + +#: ../updater/zmd/ZmdAdvancedConfig.cpp:88 +msgid "ZMD Is Listening on: " +msgstr "" + +#: ../updater/zmd/ZmdAdvancedConfig.cpp:92 +msgid "ZMD TCP Support: " +msgstr "" + +#: ../updater/zmd/ZmdAdvancedConfig.cpp:95 +#: ../updater/zmd/ZmdAdvancedConfig.cpp:147 +msgid "On" +msgstr "" + +#: ../updater/zmd/ZmdAdvancedConfig.cpp:96 +#: ../updater/zmd/ZmdAdvancedConfig.cpp:148 +msgid "Off" +msgstr "" + +#: ../updater/zmd/ZmdAdvancedConfig.cpp:103 +msgid "Security Options" +msgstr "" + +#: ../updater/zmd/ZmdAdvancedConfig.cpp:106 +msgid "Require GPG Certificates For Servers: " +msgstr "" + +#: ../updater/zmd/ZmdAdvancedConfig.cpp:109 +msgid "Yes" +msgstr "" + +#: ../updater/zmd/ZmdAdvancedConfig.cpp:110 +msgid "No" +msgstr "" + +#: ../updater/zmd/ZmdAdvancedConfig.cpp:116 +msgid "Security Level: " +msgstr "" + +#: ../updater/zmd/ZmdAdvancedConfig.cpp:121 +msgid "Proxy Options" +msgstr "" + +#: ../updater/zmd/ZmdAdvancedConfig.cpp:124 +msgid "Proxy Server:" +msgstr "" + +#: ../updater/zmd/ZmdAdvancedConfig.cpp:128 +msgid "User Name:" +msgstr "" + +#: ../updater/zmd/ZmdAdvancedConfig.cpp:132 +msgid "Password:" +msgstr "" + +#: ../updater/zmd/ZmdAdvancedConfig.cpp:137 +msgid "Other Options" +msgstr "" + +#: ../updater/zmd/ZmdAdvancedConfig.cpp:140 +msgid "ZMD Logging Level: " +msgstr "" + +#: ../updater/zmd/ZmdAdvancedConfig.cpp:144 +msgid "Rollback Support: " +msgstr "" + +#: ../updater/zmd/ZmdAdvancedConfig.cpp:154 +msgid "Max Simultaneous Downloads" +msgstr "" + +#: ../updater/zmd/ZmdAdvancedConfig.cpp:356 +msgid "Rug must be installed to configure ZMD, is it in your path?" +msgstr "" + +#: ../updater/zmd/ZmdServerDialog.cpp:80 +msgid "Please enter server name below" +msgstr "" + +#: ../updater/zmd/ZmdServerDialog.cpp:81 +msgid "Please enter server URL below" +msgstr "" + +#: ../updater/zmd/ZmdServerDialog.cpp:84 +msgid "Server Type" +msgstr "" + +#: ../updater/zmd/ZmdServerDialog.cpp:89 +msgid "NU Server" +msgstr "" + +#: ../updater/zmd/ZmdServerDialog.cpp:90 +msgid "RCE Server" +msgstr "" + +#: ../updater/zmd/ZmdConfigWindow.cpp:62 ../updater/zmd/ZmdConfigWindow.cpp:77 +msgid "Add/Remove Servers" +msgstr "" + +#: ../updater/zmd/ZmdConfigWindow.cpp:63 +msgid "Advanced Options" +msgstr "" + +#: ../updater/zmd/ZmdConfigWindow.cpp:65 ../updater/zmd/ZmdConfigWindow.cpp:88 +msgid "Add/Remove Package Servers: You may add or remove update servers below or change your software catalog subscriptions. Make whatever changes you wish and press close." +msgstr "" + +#: ../updater/zmd/ZmdConfigWindow.cpp:92 +msgid "Configure ZMD: The following are advanced options for ZMD. Only change these if you know what you are doing. Be aware, disabling TCP support will disable this updater" +msgstr "" + +#: ../updater/zmd/ZmdInstallWindow.cpp:73 +msgid "Installing updates and patches: Below is a description of the transaction and its progress. " +msgstr "" + +#. we can't yet abort an upgrade +#: ../updater/zmd/ZmdInstallWindow.cpp:77 +msgid "Abort Upgrade" +msgstr "" + +#: ../updater/zmd/ZmdInstallWindow.cpp:90 +msgid "Installing Packages..." +msgstr "" + +#: ../updater/zmd/ZmdInstallWindow.cpp:117 +msgid "The following packages will be installed:\n" +msgstr "" + +#: ../updater/zmd/ZmdInstallWindow.cpp:126 +msgid "The following packages will be updated:\n" +msgstr "" + +#: ../updater/zmd/ZmdInstallWindow.cpp:135 +msgid "" +"\n" +"The following packages must also be removed:\n" +msgstr "" + +#: ../updater/zmd/ZmdInstallWindow.cpp:142 +msgid "Transaction Summary" +msgstr "" + +#: ../updater/zmd/ZmdInstallWindow.cpp:161 +msgid "" +"\n" +"We are currently unable to show the progress for the download. This is caused by a bug in ZMD, which should be fixed soon. We apologize for any inconvenience this may cause." +msgstr "" + +#: ../updater/zmd/ZmdInstallWindow.cpp:161 +msgid "" +"\n" +"Packages Are Downloading..." +msgstr "" + +#. if this is the first time we are watching a package +#: ../updater/zmd/ZmdInstallWindow.cpp:172 +msgid "Packages Are Downloading..." +msgstr "" + +#. we have just started the transaction, download is now done +#: ../updater/zmd/ZmdInstallWindow.cpp:179 +#: ../updater/zmd/ZmdInstallWindow.cpp:199 +msgid "Done" +msgstr "" + +#. This should never run +#: ../updater/zmd/ZmdInstallWindow.cpp:186 +msgid "Download failed: " +msgstr "" + +#. if we are not already watching a package and the transaction is running +#: ../updater/zmd/ZmdInstallWindow.cpp:209 +msgid "Packages Are Being Installed..." +msgstr "" + +#. if the transaction is done and we have not already marked it done +#: ../updater/zmd/ZmdInstallWindow.cpp:215 +msgid " Done." +msgstr "" + +#: ../updater/zmd/ZmdInstallWindow.cpp:231 +msgid "Sorry, we couldn't resolve the dependencies for this update:\n" +msgstr "" + +#: ../updater/zmd/ZmdInstallWindow.cpp:235 +msgid "Upgrade Failed: " +msgstr "" + +#: ../updater/zmd/ZmdInstallWindow.cpp:239 +msgid "Done!" +msgstr "" + +#: ../updater/zmd/ZmdInstallWindow.cpp:278 +msgid "Resolving Dependencies..." +msgstr "" + +#: ../updater/UpdaterApplication.cpp:82 +msgid "" +"Backend plugin is not properly configured.\n" +"Please use the configuration dialog to choose the correct one." +msgstr "" + +#: ../updater/zypp_traditional/ZYppUpdater.cpp:165 +msgid "Security" +msgstr "" + +#: ../updater/TrayIcon.cpp:50 ../updater/TrayIcon.cpp:90 +msgid "New software for your system is available" +msgstr "" + +#: ../updater/TrayIcon.cpp:72 +msgid "Checking for updates..." +msgstr "" + +#: ../updater/TrayIcon.cpp:77 +msgid "Error:\n" +msgstr "" + +#: ../updater/TrayIcon.cpp:82 +msgid "No Updates Available" +msgstr "" + +#: ../updater/TrayIcon.cpp:125 +msgid "Updating..." +msgstr "" Modified: trunk/updater-kde/updater/ConfigWidgetUI.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/ConfigWidget… ============================================================================== --- trunk/updater-kde/updater/ConfigWidgetUI.h (original) +++ trunk/updater-kde/updater/ConfigWidgetUI.h Mon Jul 30 16:11:53 2007 @@ -21,6 +21,7 @@ class QCheckBox; class QLabel; class QFrame; +class QComboBox; class ConfigWidgetUI : public QWidget { @@ -35,6 +36,7 @@ QCheckBox* kcfg_ShowPackages; QLabel* textLabel2; QFrame* BackendFrame; + QSpinBox* kcfg_WarnInterval; protected: QVBoxLayout* ConfigWidgetUILayout; Modified: trunk/updater-kde/updater/ConfigWidgetUI.ui URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/ConfigWidget… ============================================================================== --- trunk/updater-kde/updater/ConfigWidgetUI.ui (original) +++ trunk/updater-kde/updater/ConfigWidgetUI.ui Mon Jul 30 16:11:53 2007 @@ -36,6 +36,20 @@ </property> </widget> + <widget class="QSpinBox"> + <property name="name"> + <cstring>kcfg_WarnInterval</cstring> + </property> + <property name="prefix"> + <string>Show recurring notification every </string> + </property> + <property name="suffix"> + <string> Minutes when updates are available</string> + </property> + <property name="minValue"> + <number>0</number> + </property> + </widget> <widget class="QCheckBox"> <property name="name"> <cstring>kcfg_Autostart</cstring> Modified: trunk/updater-kde/updater/TrayIcon.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/TrayIcon.cpp… ============================================================================== --- trunk/updater-kde/updater/TrayIcon.cpp (original) +++ trunk/updater-kde/updater/TrayIcon.cpp Mon Jul 30 16:11:53 2007 @@ -23,11 +23,14 @@ #include <klocale.h> #include <qlayout.h> #include <kdialog.h> +#include <qtimer.h> #include <qtooltip.h> #include "TrayIcon.h" #include "Updater.h" +#include "opensuseupdater_settings.h" + TrayIcon::TrayIcon(QWidget *parent) : KSystemTray(parent), patchCount(0), @@ -85,8 +88,7 @@ case APPLET_UPDATES: case APPLET_CRITICAL_UPDATES: setPixmap(loadIcon(TRAY_ICON_YELLOW)); - QToolTip::add(this, i18n("New software for your system is available")); - popup->show(); + showPopup(); break; case APPLET_INSTALLING: @@ -97,6 +99,22 @@ } } +void TrayIcon::showPopup() +{ + if ( appletState == APPLET_UPDATES || + appletState == APPLET_CRITICAL_UPDATES ) + { + QToolTip::add(this, i18n("New software for your system is available")); + popup->show(); + + int warnInterval = UpdaterSettings::self()->warnInterval() * 60 * 1000; // convert minutes to ms + + if (warnInterval > 0 ) + QTimer::singleShot( warnInterval, this , SLOT(showPopup() )); + } +} + + void TrayIcon::setUpdates(int patches, int packages) { if (patches >= 0) Modified: trunk/updater-kde/updater/TrayIcon.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/TrayIcon.h?r… ============================================================================== --- trunk/updater-kde/updater/TrayIcon.h (original) +++ trunk/updater-kde/updater/TrayIcon.h Mon Jul 30 16:11:53 2007 @@ -50,6 +50,7 @@ private slots: void popupClicked(); + void showPopup(); private: Modified: trunk/updater-kde/updater/opensuseupdater_settings.kcfg URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/opensuseupda… ============================================================================== --- trunk/updater-kde/updater/opensuseupdater_settings.kcfg (original) +++ trunk/updater-kde/updater/opensuseupdater_settings.kcfg Mon Jul 30 16:11:53 2007 @@ -7,6 +7,10 @@ <label>How often to check for updates.</label> <default>24</default> </entry> + <entry name="WarnInterval" type="Int"> + <label>How otfen show recurring warning when updates are available.</label> + <default>15</default> + </entry> --> <entry name="Autostart" type="Bool"> <label>Automatically start the applet on login</label> <default>true</default> -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0