September 2007 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r7379 - /branches/SuSE-Linux-10_3-Branch/libzypp/zypp/solver/detail/QueueItemRequire.cc
by schubi2＠svn.opensuse.org 25 Sep '07

25 Sep '07

Author: schubi2 Date: Tue Sep 25 18:49:56 2007 New Revision: 7379 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7379&view=rev Log: filter out all resolvables which have worser architecture, are NOT noarch and have not the same name as the requirement. The last one is needed for updating packages via patch/atoms. Modified: branches/SuSE-Linux-10_3-Branch/libzypp/zypp/solver/detail/QueueItemRequire.cc Modified: branches/SuSE-Linux-10_3-Branch/libzypp/zypp/solver/detail/QueueItemRequire.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-10_3-Branch/libzyp… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/libzypp/zypp/solver/detail/QueueItemRequire.cc (original) +++ branches/SuSE-Linux-10_3-Branch/libzypp/zypp/solver/detail/QueueItemRequire.cc Tue Sep 25 18:49:56 2007 @@ -21,6 +21,8 @@ #include <sstream> +#include "zypp/CapFactory.h" +#include "zypp/CapMatch.h" #include "zypp/CapSet.h" #include "zypp/base/Logger.h" #include "zypp/base/String.h" @@ -541,29 +543,6 @@ _XDEBUG("Look for providers of " << _capability); - if (!context->tryAllPossibilities()) { - // If there is one item with the better architecture than the others-->take it - PoolItem_Ref bestItem = PoolItem_Ref(); - PoolItemList::iterator it; - for (it = info.providers.begin(); - it != info.providers.end(); it++) { - if (bestItem == PoolItem_Ref()) { - bestItem = *it; - } else if (bestItem->arch().compare( (*it)->arch() ) < 0) { // better arch - _XDEBUG("Taking only one provider with the best architecture --> ignoring e.g. " << bestItem); - bestItem = *it; - break; - } - } - if (it != info.providers.end()) { - // found one with better architecture --> take it; - info.providers.clear(); - info.providers.push_front(bestItem); - context->setSkippedPossibilities( true ); // Flag that there are other possibilities - _XDEBUG("Taking only one provider with the best architecture: " << bestItem); - } - } - num_providers = info.providers.size(); _XDEBUG( "requirement is met by " << num_providers << " resolvable"); @@ -726,7 +705,7 @@ && uninstalled > 0) { PoolItemList::iterator next; - for (PoolItemList::iterator it = info.providers.begin(); it != info.providers.end(); ++it) { + for (PoolItemList::iterator it = info.providers.begin(); it != info.providers.end();) { next = it; ++next; if (it->status().staysUninstalled()) { MIL << "Not considering " << *it << endl; @@ -737,6 +716,46 @@ } } + if (!context->tryAllPossibilities()) { + // Evaluate the best architecture of the providers + Arch bestArch = Arch(); // is noarch + PoolItemList::iterator it; + for (it = info.providers.begin(); + it != info.providers.end(); it++) { + if (bestArch.compare( (*it)->arch() ) < 0) { // better arch + bestArch = (*it)->arch(); + } + } + + // filter out all resolvables which have worser architecture, are NOT noarch + // and have not the same name as the requirement. The last one is needed + // for updating packages via patch/atoms. + PoolItemList::iterator next; + for (it = info.providers.begin(); + it != info.providers.end();) { + + bool nameFit = false; + CapFactory factory; + if (isKind<capability::NamedCap>( _capability ) ) { + Capability capTest = factory.parse ( (*it)->kind(), (*it)->name(), Rel::ANY, Edition::noedition ); + if (capTest.matches (_capability) == CapMatch::yes) { + nameFit = true; + _XDEBUG("Required Capability " << _capability << " has the same name as the provider:" << *it); + _XDEBUG(" --> do not trow away althout it could have the wrong architecture"); + } + } + + next = it; ++next; + if ((*it)->arch() != bestArch + && (*it)->arch() != Arch_noarch + && !nameFit) { + _XDEBUG("Kicking " << *it << " due best architecture " << bestArch); + info.providers.erase( it ); + } + it = next; + } + } + num_providers = info.providers.size(); } // num_providers > 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] r7378 - in /trunk/libzypp-bindings/swig: KeyRing.i Pathname.i PublicKey.i RepoInfo.i RepoManager.i Target.i TmpPath.i perl5/perl.i python/python.i ruby/ruby.i zypp.i
by aschnell＠svn.opensuse.org 25 Sep '07

25 Sep '07

Author: aschnell Date: Tue Sep 25 18:31:06 2007 New Revision: 7378 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7378&view=rev Log: - include original C header files Modified: trunk/libzypp-bindings/swig/KeyRing.i trunk/libzypp-bindings/swig/Pathname.i trunk/libzypp-bindings/swig/PublicKey.i trunk/libzypp-bindings/swig/RepoInfo.i trunk/libzypp-bindings/swig/RepoManager.i trunk/libzypp-bindings/swig/Target.i trunk/libzypp-bindings/swig/TmpPath.i trunk/libzypp-bindings/swig/perl5/perl.i trunk/libzypp-bindings/swig/python/python.i trunk/libzypp-bindings/swig/ruby/ruby.i trunk/libzypp-bindings/swig/zypp.i Modified: trunk/libzypp-bindings/swig/KeyRing.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/KeyRing.i?… ============================================================================== --- trunk/libzypp-bindings/swig/KeyRing.i (original) +++ trunk/libzypp-bindings/swig/KeyRing.i Tue Sep 25 18:31:06 2007 @@ -6,7 +6,7 @@ public: - KeyRing(const Pathname& baseTmpDir); + KeyRing(const zypp::Pathname& baseTmpDir); ~KeyRing(); void importKey(const PublicKey& key, bool trusted = false); Modified: trunk/libzypp-bindings/swig/Pathname.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/Pathname.i… ============================================================================== --- trunk/libzypp-bindings/swig/Pathname.i (original) +++ trunk/libzypp-bindings/swig/Pathname.i Tue Sep 25 18:31:06 2007 @@ -1,42 +1,4 @@ -class Pathname -{ -public: - - Pathname(); - Pathname(const std::string&); - Pathname(const char*); - - const std::string & asString() const; - - bool empty() const; - bool absolute() const; - bool relative() const; - -}; - - -// #ifdef SWIGRUBY -// -// // Something like 'opts.repoCachePath = tmp_cache_path.path()' causes out and -// // in transformation. Can that be avoided? -// -// %typemap(in) const Pathname&, Pathname* { -// VALUE pathstring = rb_funcall( $input, rb_intern("to_s"), 0, 0); -// Pathname *p = new Pathname( (RSTRING(pathstring)->ptr) ); -// $1 = p; -// } -// -// %typemap(freearg) const Pathname&, Pathname* { -// delete $1; -// } -// -// %typemap(out) Pathname { -// rb_require("pathname"); -// VALUE klass = rb_const_get( rb_cObject, rb_intern("Pathname")); -// VALUE rbpathstr = rb_str_new2($1.asString().c_str()); -// $result = rb_funcall( klass, rb_intern("new"), 1, rbpathstr); -// } -// -// #endif +// TODO: tell make about dependencies +%include <zypp/Pathname.h> Modified: trunk/libzypp-bindings/swig/PublicKey.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/PublicKey.… ============================================================================== --- trunk/libzypp-bindings/swig/PublicKey.i (original) +++ trunk/libzypp-bindings/swig/PublicKey.i Tue Sep 25 18:31:06 2007 @@ -5,7 +5,7 @@ public: PublicKey(); - PublicKey(const Pathname& file); + PublicKey(const zypp::Pathname& file); ~PublicKey(); bool isValid() const; @@ -15,7 +15,7 @@ std::string id() const; std::string name() const; std::string fingerprint() const; - Pathname path() const; + zypp::Pathname path() const; }; Modified: trunk/libzypp-bindings/swig/RepoInfo.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/RepoInfo.i… ============================================================================== --- trunk/libzypp-bindings/swig/RepoInfo.i (original) +++ trunk/libzypp-bindings/swig/RepoInfo.i Tue Sep 25 18:31:06 2007 @@ -71,7 +71,7 @@ * \note could be an empty pathname for repo * infos created in memory. */ - Pathname filepath() const; + zypp::Pathname filepath() const; /** * Add a base url. \see baseUrls @@ -121,7 +121,7 @@ * \short set the repository filepath * \param path File path */ - RepoInfo & setFilepath( const Pathname &filename ); + RepoInfo & setFilepath( const zypp::Pathname &filename ); std::ostream & dumpOn( std::ostream & str ) const; Modified: trunk/libzypp-bindings/swig/RepoManager.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/RepoManage… ============================================================================== --- trunk/libzypp-bindings/swig/RepoManager.i (original) +++ trunk/libzypp-bindings/swig/RepoManager.i Tue Sep 25 18:31:06 2007 @@ -1,13 +1,13 @@ - + std::list<RepoInfo> readRepoFile(const Url & repo_file); struct RepoManagerOptions { RepoManagerOptions(); - - Pathname repoCachePath; - Pathname repoRawCachePath; - Pathname knownReposPath; + + zypp::Pathname repoCachePath; + zypp::Pathname repoRawCachePath; + zypp::Pathname knownReposPath; }; class RepoManager @@ -15,24 +15,24 @@ public: RepoManager( const RepoManagerOptions &options = RepoManagerOptions() ); ~RepoManager(); - + enum RawMetadataRefreshPolicy { RefreshIfNeeded, RefreshForced }; - + enum CacheBuildPolicy { BuildIfNeeded, BuildForced }; - + enum RepoRemovePolicy { - + }; - + std::list<RepoInfo> knownRepositories() const; void refreshMetadata( const RepoInfo &info, RawMetadataRefreshPolicy policy = RefreshIfNeeded, @@ -53,5 +53,5 @@ const ProgressData::ReceiverFnc & progressrcv = ProgressData::ReceiverFnc() ); void removeRepository( const RepoInfo & info, const ProgressData::ReceiverFnc & progressrcv = ProgressData::ReceiverFnc() ); - + }; Modified: trunk/libzypp-bindings/swig/Target.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/Target.i?r… ============================================================================== --- trunk/libzypp-bindings/swig/Target.i (original) +++ trunk/libzypp-bindings/swig/Target.i Tue Sep 25 18:31:06 2007 @@ -44,14 +44,14 @@ #ifndef STORAGE_DISABLED /** enables the storage target */ bool isStorageEnabled() const; - void enableStorage(const Pathname &root_r); + void enableStorage(const zypp::Pathname &root_r); #endif /** Set the log file for target */ - bool setInstallationLogfile(const Pathname & path_r); + bool setInstallationLogfile(const zypp::Pathname & path_r); /** Return the root set for this target */ - Pathname root() const; + zypp::Pathname root() const; /** return the last modification date of the target */ Date timestamp() const; Modified: trunk/libzypp-bindings/swig/TmpPath.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/TmpPath.i?… ============================================================================== --- trunk/libzypp-bindings/swig/TmpPath.i (original) +++ trunk/libzypp-bindings/swig/TmpPath.i Tue Sep 25 18:31:06 2007 @@ -1,45 +1,4 @@ -class TmpPath -{ -public: - - TmpPath(); - - explicit TmpPath( const Pathname & tmpPath_r ); - - virtual ~TmpPath(); - - Pathname path() const; - - static const Pathname & defaultLocation(); - -}; - - -class TmpFile : public TmpPath -{ -public: - - explicit TmpFile( const Pathname & inParentDir_r = defaultLocation(), - const std::string & prefix_r = defaultPrefix() ); - - static TmpFile makeSibling( const Pathname & sibling_r ); - - static const std::string & defaultPrefix(); - -}; - - -class TmpDir : public TmpPath -{ -public: - - explicit TmpDir( const Pathname & inParentDir_r = defaultLocation(), - const std::string & prefix_r = defaultPrefix() ); - - static TmpDir makeSibling( const Pathname & sibling_r ); - - static const std::string & defaultPrefix(); - -}; +// TODO: tell make about dependencies +%include <zypp/TmpPath.h> Modified: trunk/libzypp-bindings/swig/perl5/perl.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/perl5/perl… ============================================================================== --- trunk/libzypp-bindings/swig/perl5/perl.i (original) +++ trunk/libzypp-bindings/swig/perl5/perl.i Tue Sep 25 18:31:06 2007 @@ -1,3 +1,13 @@ + +namespace zypp +{ + // These operators must be ignored otherwise the wrapper does + // not compile (using swig 1.3.29). + %ignore operator<<; + %ignore operator==; + %ignore operator!=; +} + %define iter(cls, storetype) %extend cls { cls::const_iterator iterator_incr(cls::const_iterator *it){ Modified: trunk/libzypp-bindings/swig/python/python.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/python/pyt… ============================================================================== --- trunk/libzypp-bindings/swig/python/python.i (original) +++ trunk/libzypp-bindings/swig/python/python.i Tue Sep 25 18:31:06 2007 @@ -5,6 +5,11 @@ namespace zypp { + // These operators must be ignored otherwise the wrapper does + // not compile (using swig 1.3.29). + %ignore operator==; + %ignore operator!=; + // Just to avoid warnings. %ignore operator<<; } Modified: trunk/libzypp-bindings/swig/ruby/ruby.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/ruby/ruby.… ============================================================================== --- trunk/libzypp-bindings/swig/ruby/ruby.i (original) +++ trunk/libzypp-bindings/swig/ruby/ruby.i Tue Sep 25 18:31:06 2007 @@ -13,6 +13,14 @@ // Just to avoid warnings. %ignore operator!=; %ignore operator<<; + + namespace filesystem + { + // Same as above. + %ignore operator==; + %ignore operator!=; + %ignore operator<<; + } } Modified: trunk/libzypp-bindings/swig/zypp.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/zypp.i?rev… ============================================================================== --- trunk/libzypp-bindings/swig/zypp.i (original) +++ trunk/libzypp-bindings/swig/zypp.i Tue Sep 25 18:31:06 2007 @@ -144,7 +144,7 @@ void setPartitions(const DiskUsageCounter::MountPointSet &mp); */ Target_Ptr target() const; - void initializeTarget(const Pathname & root); + void initializeTarget(const zypp::Pathname & root); void finishTarget(); typedef ZYppCommitResult CommitResult; @@ -162,9 +162,9 @@ LocaleSet getAvailableLocales() const; void availableLocale( const Locale & locale_r ); */ - Pathname homePath() const; - Pathname tmpPath() const; - void setHomePath( const Pathname & path ); + zypp::Pathname homePath() const; + zypp::Pathname tmpPath() const; + void setHomePath( const zypp::Pathname & path ); Arch architecture() const; void setArchitecture( const Arch & arch ); -- 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] r7377 - /trunk/zypper/VERSION.cmake
by jkupec＠svn.opensuse.org 25 Sep '07

25 Sep '07

Author: jkupec Date: Tue Sep 25 18:05:37 2007 New Revision: 7377 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7377&view=rev Log: - fixed typo Modified: trunk/zypper/VERSION.cmake Modified: trunk/zypper/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/VERSION.cmake?rev=7377&r1… ============================================================================== --- trunk/zypper/VERSION.cmake (original) +++ trunk/zypper/VERSION.cmake Tue Sep 25 18:05:37 2007 @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Tue Sep 25 18:03:32 CEST 2007 - jkupec(a)suse.cz - -- - # ========== # Versioning # ========== -- 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] r7376 - /trunk/zypper/VERSION.cmake
by jkupec＠svn.opensuse.org 25 Sep '07

25 Sep '07

Author: jkupec Date: Tue Sep 25 18:04:14 2007 New Revision: 7376 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7376&view=rev Log: - bump minor version to 9 Modified: trunk/zypper/VERSION.cmake Modified: trunk/zypper/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/VERSION.cmake?rev=7376&r1… ============================================================================== --- trunk/zypper/VERSION.cmake (original) +++ trunk/zypper/VERSION.cmake Tue Sep 25 18:04:14 2007 @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Sep 25 18:03:32 CEST 2007 - jkupec(a)suse.cz + +- + # ========== # Versioning # ========== @@ -19,5 +24,5 @@ # SET(VERSION_MAJOR "0") -SET(VERSION_MINOR "8") -SET(VERSION_PATCH "23") +SET(VERSION_MINOR "9") +SET(VERSION_PATCH "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] r7375 - /trunk/zypper/package/zypper.changes
by jkupec＠svn.opensuse.org 25 Sep '07

25 Sep '07

Author: jkupec Date: Tue Sep 25 18:01:08 2007 New Revision: 7375 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7375&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 Tue Sep 25 18:01:08 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Sep 25 17:59:22 CEST 2007 - jkupec(a)suse.cz + +- report malformed URLs correctly in zypper addrepo (#325660) +- make compiler happy about /* withing comments +- r7374 + +------------------------------------------------------------------- Fri Sep 21 16:45:18 CEST 2007 - jkupec(a)suse.cz - fix zypper refresh exit status (#326694) -- 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] r7374 - in /trunk/zypper/src: zypper-source-callbacks.h zypper-sources.cc
by jkupec＠svn.opensuse.org 25 Sep '07

25 Sep '07

Author: jkupec Date: Tue Sep 25 18:00:30 2007 New Revision: 7374 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7374&view=rev Log: make compiler happy about /* withing comments Modified: trunk/zypper/src/zypper-source-callbacks.h trunk/zypper/src/zypper-sources.cc Modified: trunk/zypper/src/zypper-source-callbacks.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-source-callbac… ============================================================================== --- trunk/zypper/src/zypper-source-callbacks.h (original) +++ trunk/zypper/src/zypper-source-callbacks.h Tue Sep 25 18:00:30 2007 @@ -39,7 +39,7 @@ cout << "Determining " << url << " source type..." << endl; } - virtual void failedProbe( const zypp::Url &/*url*//*, const std::string & type ) + virtual void failedProbe( const zypp::Url & url*//*, const std::string & type ) { cout << ".. not " << type << endl; } @@ -49,7 +49,7 @@ cout << url << " is type " << type << endl; } - virtual void finish(const zypp::Url &/*url*//*, Error error, const std::string & reason ) + virtual void finish(const zypp::Url & url*//*, Error error, const std::string & reason ) { if ( error == INVALID ) { @@ -58,10 +58,10 @@ } } - virtual bool progress(const zypp::Url &/*url*//*, int /*value*//*) + virtual bool progress(const zypp::Url & url*//*, int value*//*) { return true; } - virtual Action problem( const zypp::Url &/*url*//*, Error error, const std::string & description ) + virtual Action problem( const zypp::Url & url*//*, Error error, const std::string & description ) { display_done (); display_error (error, description); 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 Tue Sep 25 18:00:30 2007 @@ -1132,7 +1132,7 @@ cerr_vv << "Constructing SourceManager" << endl; SourceManager_Ptr manager = SourceManager::sourceManager(); cerr_vv << "Restoring SourceManager" << endl; - manager->restore (gSettings.root_dir, true /*use_cache*//*); + manager->restore (gSettings.root_dir, true use_cache*//*); Source_Ref src; @@ -1190,7 +1190,7 @@ } cerr_vv << "Storing source data" << endl; - manager->store( gSettings.root_dir, true /*metadata_cache*//* ); + manager->store( gSettings.root_dir, true metadata_cache*//* ); } */ // ---------------------------------------------------------------------------- -- 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] r7373 - in /trunk/zypper/src: zypper-sources.cc zypper-utils.cc zypper-utils.h zypper.cc
by jkupec＠svn.opensuse.org 25 Sep '07

25 Sep '07

Author: jkupec Date: Tue Sep 25 17:47:07 2007 New Revision: 7373 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7373&view=rev Log: - report malformed URLs correctly in zypper addrepo (#325660) Modified: trunk/zypper/src/zypper-sources.cc trunk/zypper/src/zypper-utils.cc trunk/zypper/src/zypper-utils.h trunk/zypper/src/zypper.cc 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 Tue Sep 25 17:47:07 2007 @@ -661,7 +661,7 @@ int add_repo(RepoInfo & repo) { RepoManager manager; - + bool is_cd = true; for(RepoInfo::urls_const_iterator it = repo.baseUrlsBegin(); it != repo.baseUrlsEnd(); ++it) @@ -676,6 +676,7 @@ repo.setAutorefresh(false); } + MIL << "Going to add repository: " << repo << endl; try @@ -766,20 +767,23 @@ const string & type, tribool enabled, tribool autorefresh) { + MIL << "going to add repository by url (alias=" << alias << ", url=" << url + << ")" << endl; + RepoManager manager; RepoInfo repo; - + if ( ! type.empty() ) repo.setType(RepoType(type)); - + repo.setAlias(alias.empty() ? timestamp() : alias); repo.addBaseUrl(url); - + if ( !indeterminate(enabled) ) repo.setEnabled((enabled == true)); if ( !indeterminate(autorefresh) ) repo.setAutorefresh((autorefresh == true)); - + return add_repo(repo); } @@ -790,7 +794,10 @@ tribool enabled, tribool autorefresh) { //! \todo handle local .repo files, validate the URL - Url url(repo_file_url); + Url url = make_url(repo_file_url); + if (!url.isValid()) + return ZYPPER_EXIT_ERR_INVALID_ARGS; + RepoManager manager; list<RepoInfo> repos; Modified: trunk/zypper/src/zypper-utils.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-utils.cc?rev=7… ============================================================================== --- trunk/zypper/src/zypper-utils.cc (original) +++ trunk/zypper/src/zypper-utils.cc Tue Sep 25 17:47:07 2007 @@ -52,9 +52,20 @@ bool is_changeable_media(const zypp::Url & url) { - media::MediaManager mm; media::MediaAccessId id = mm.open(url); - bool is_cd = mm.isChangeable(id); - mm.close(id); + bool is_cd = false; + try + { + media::MediaManager mm; + media::MediaAccessId id = mm.open(url); + is_cd = mm.isChangeable(id); + mm.close(id); + } + catch (const media::MediaException & e) + { + ZYPP_CAUGHT(e); + WAR << "Could not determine if the URL points to a changeable media" << endl; + } + return is_cd; } @@ -87,3 +98,19 @@ // default return _PL("resolvable", "resolvables", count); } + +// ---------------------------------------------------------------------------- + +Url make_url (const string & url_s) { + Url u; + + try { + u = Url( (url_s[0] == '/') ? string("dir:") + url_s : url_s ); + } + catch ( const Exception & excpt_r ) { + ZYPP_CAUGHT( excpt_r ); + cerr << _("Given URL is invalid.") << endl; + cerr << excpt_r.asUserString() << endl; + } + return u; +} Modified: trunk/zypper/src/zypper-utils.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-utils.h?rev=73… ============================================================================== --- trunk/zypper/src/zypper-utils.h (original) +++ trunk/zypper/src/zypper-utils.h Tue Sep 25 17:47:07 2007 @@ -21,4 +21,10 @@ std::string kind_to_string_localized( const zypp::KindOf<zypp::Resolvable> & kind, unsigned long count); +/** + * Constructor wrapper catching exceptions, + * returning an empty one on error. + */ +zypp::Url make_url (const std::string & url_s); + #endif /*ZYPPER_UTILS_H*/ Modified: trunk/zypper/src/zypper.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper.cc?rev=7373&r1… ============================================================================== --- trunk/zypper/src/zypper.cc (original) +++ trunk/zypper/src/zypper.cc Tue Sep 25 17:47:07 2007 @@ -61,24 +61,6 @@ DigestCallbacks digest_callbacks; -/** - * Constructor wrapper catching exceptions, - * returning an empty one on error. - */ -Url make_url (const string & url_s) { - Url u; - - try { - u = Url( (url_s[0] == '/') ? string("dir:") + url_s : url_s ); - } - catch ( const Exception & excpt_r ) { - ZYPP_CAUGHT( excpt_r ); - cerr << _("Given URL is invalid.") << endl; - cerr << excpt_r.asUserString() << endl; - } - return u; -} - bool ghelp = false; static string help_commands = _( " Commands:\n" @@ -848,28 +830,22 @@ cout_n << specific_help; return ZYPPER_EXIT_ERR_INVALID_ARGS; } - + Url url = make_url (arguments[0]); - if (!url.isValid()) //! \todo error message + if (!url.isValid()) return ZYPPER_EXIT_ERR_INVALID_ARGS; - - string alias; - if (arguments.size() > 1) - alias = arguments[1]; - //! \todo use timestamp as alias, if no alias was given? - if (alias.empty ()) - alias = url.asString(); - + // by default, enable the repo and set autorefresh if (indeterminate(enabled)) enabled = true; if (indeterminate(refresh)) refresh = true; - + warn_if_zmd(); - + // load gpg keys cond_init_target (); - - return add_repo_by_url(url, alias, type, enabled, refresh); + + return add_repo_by_url( + url, arguments[1]/*alias*/, type, enabled, refresh); } catch (const repo::RepoUnknownTypeException & e) { -- 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] r7372 - in /trunk/updater-kde/package: opensuse-updater-kde.changes opensuse-updater-kde.spec
by tgoettlicher＠svn.opensuse.org 25 Sep '07

25 Sep '07

Author: tgoettlicher Date: Tue Sep 25 16:44:19 2007 New Revision: 7372 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7372&view=rev Log: changes 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 Tue Sep 25 16:44:19 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Sep 25 16:37:36 CEST 2007 - tgoettlicher(a)suse.de + +- fixed /tmp problem in zypper_install (#327367) +- r7370 + +------------------------------------------------------------------- Mon Sep 24 18:25:16 CEST 2007 - tgoettlicher(a)suse.de - updated translations 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 Tue Sep 25 16:44:19 2007 @@ -90,6 +90,8 @@ %changelog -n opensuse-updater-kde ------------------------------------------------------------------- +*Tue Sep 25 2007 - tgoettlicher(a)suse.de +- second fix for /tmp problem in zypper_install (#327367) *Mon Sep 24 2007 - tgoettlicher(a)suse.de - updated translations - fixed /tmp problem in zypper_install (#327367) -- 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] r7371 - in /trunk/libzypp-bindings: examples/python/exception.py examples/ruby/exception.rb swig/python/python.i
by aschnell＠svn.opensuse.org 25 Sep '07

25 Sep '07

Author: aschnell Date: Tue Sep 25 16:41:52 2007 New Revision: 7371 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7371&view=rev Log: - exception now also in Python Added: trunk/libzypp-bindings/examples/python/exception.py (with props) Modified: trunk/libzypp-bindings/examples/ruby/exception.rb trunk/libzypp-bindings/swig/python/python.i Added: trunk/libzypp-bindings/examples/python/exception.py URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/examples/python… ============================================================================== --- trunk/libzypp-bindings/examples/python/exception.py (added) +++ trunk/libzypp-bindings/examples/python/exception.py Tue Sep 25 16:41:52 2007 @@ -0,0 +1,33 @@ +#!/usr/bin/python + +from zypp import TmpDir, RepoManagerOptions, RepoManager, RepoInfo, Url + +tmp_cache_path = TmpDir() +tmp_raw_cache_path = TmpDir() +tmp_known_repos_path = TmpDir() + +opts = RepoManagerOptions() +opts.repoCachePath = tmp_cache_path.path() +opts.repoRawCachePath = tmp_raw_cache_path.path() +opts.knownReposPath = tmp_known_repos_path.path() + +repo_manager = RepoManager(opts) + +repo_info = RepoInfo() + +repo_info.setAlias("factorytest") +repo_info.setName("Test Repo for Factory.") +repo_info.setEnabled(True) +repo_info.setAutorefresh(False) +repo_info.addBaseUrl(Url("file:///tmp/does-not-exist")) + +try: + repo_manager.addRepository(repo_info) + repo_manager.refreshMetadata(repo_info) + repo_manager.buildCache(repo_info) +except RuntimeError, strerror: + print "RuntimeError" + print strerror +else: + print "Oh, no exception" + Modified: trunk/libzypp-bindings/examples/ruby/exception.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/examples/ruby/e… ============================================================================== --- trunk/libzypp-bindings/examples/ruby/exception.rb (original) +++ trunk/libzypp-bindings/examples/ruby/exception.rb Tue Sep 25 16:41:52 2007 @@ -20,7 +20,7 @@ repo_info.set_name("Test Repo for Factory.") repo_info.set_enabled(true) repo_info.set_autorefresh(false) -repo_info.add_base_url("file:///tmp/does-not-exist") +repo_info.add_base_url(Url.new("file:///tmp/does-not-exist")) begin repo_manager.add_repository(repo_info) @@ -28,7 +28,7 @@ repo_manager.build_cache(repo_info) rescue ZYppException => e puts "ZYppException caught" - puts e.to_s + puts e else puts "Oh, no exception" end Modified: trunk/libzypp-bindings/swig/python/python.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/python/pyt… ============================================================================== --- trunk/libzypp-bindings/swig/python/python.i (original) +++ trunk/libzypp-bindings/swig/python/python.i Tue Sep 25 16:41:52 2007 @@ -22,3 +22,16 @@ }; %enddef + +%exception +{ + try { + $action + } + catch (const Exception& e) { + std::string tmp = e.historyAsString() + e.asUserString(); + PyErr_SetString(PyExc_RuntimeError, const_cast<char*>(tmp.c_str())); + return NULL; + } +} + -- 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] r7370 - /trunk/updater-kde/updater/zypp/zypper_install
by tgoettlicher＠svn.opensuse.org 25 Sep '07

25 Sep '07

Author: tgoettlicher Date: Tue Sep 25 16:40:45 2007 New Revision: 7370 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7370&view=rev Log: #327367 Modified: trunk/updater-kde/updater/zypp/zypper_install Modified: trunk/updater-kde/updater/zypp/zypper_install URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/zypp/zypper_… ============================================================================== --- trunk/updater-kde/updater/zypp/zypper_install (original) +++ trunk/updater-kde/updater/zypp/zypper_install Tue Sep 25 16:40:45 2007 @@ -46,8 +46,9 @@ err=${tempdir}/opensuseupdater_err -mkfifo $out -mkfifo $err +mkfifo $out || { echo "can't mkfifo $out" >&2 ; exit 1 ; } +mkfifo $err || { echo "can't mkfifo $err" >&2 ; exit 1 ; } + retval=0 -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0