September 2007 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r7186 - /trunk/updater-kde/updater/MainWindow.cpp
by tgoettlicher＠svn.opensuse.org 11 Sep '07

11 Sep '07

Author: tgoettlicher Date: Tue Sep 11 15:28:58 2007 New Revision: 7186 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7186&view=rev Log: fixed to disable checking button while checking for updates Modified: trunk/updater-kde/updater/MainWindow.cpp Modified: trunk/updater-kde/updater/MainWindow.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/MainWindow.c… ============================================================================== --- trunk/updater-kde/updater/MainWindow.cpp (original) +++ trunk/updater-kde/updater/MainWindow.cpp Tue Sep 11 15:28:58 2007 @@ -405,6 +405,9 @@ applet->setState(state); } + _check_updates_action->setEnabled(true); + _edit_sources_action->setEnabled(true); + if ( state == APPLET_CHECKING || state == APPLET_INSTALLING || state == APPLET_NO_NETWORK ) _check_updates_action->setEnabled(false); else @@ -412,8 +415,6 @@ - _check_updates_action->setEnabled(true); - _edit_sources_action->setEnabled(true); } -- 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] r7185 - in /trunk/libzypp: devel/devel.ma/Parse.cc package/libzypp.changes zypp/DiskUsageCounter.cc zypp/target/rpm/RpmPackageImpl.cc zypp/target/rpm/RpmPackageImpl.h
by mlandres＠svn.opensuse.org 11 Sep '07

11 Sep '07

Author: mlandres Date: Tue Sep 11 15:01:52 2007 New Revision: 7185 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7185&view=rev Log: changes Modified: trunk/libzypp/devel/devel.ma/Parse.cc trunk/libzypp/package/libzypp.changes trunk/libzypp/zypp/DiskUsageCounter.cc trunk/libzypp/zypp/target/rpm/RpmPackageImpl.cc trunk/libzypp/zypp/target/rpm/RpmPackageImpl.h Modified: trunk/libzypp/devel/devel.ma/Parse.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.ma/Parse.cc?… ============================================================================== --- trunk/libzypp/devel/devel.ma/Parse.cc (original) +++ trunk/libzypp/devel/devel.ma/Parse.cc Tue Sep 11 15:01:52 2007 @@ -35,11 +35,12 @@ #include "zypp/RepoInfo.h" #include "zypp/ui/PatchContents.h" +#include "zypp/ResPoolProxy.h" using namespace std; using namespace zypp; using namespace zypp::functor; - +using namespace zypp::ui; using zypp::parser::TagParser; /////////////////////////////////////////////////////////////////// @@ -48,14 +49,44 @@ /////////////////////////////////////////////////////////////////// +template<class _Res> +Selectable::Ptr getSel( const std::string & name_r ) +{ + ResPoolProxy uipool( getZYpp()->poolProxy() ); + for_(it, uipool.byKindBegin<_Res>(), uipool.byKindEnd<_Res>() ) + { + if ( (*it)->name() == name_r ) + return (*it); + } + return 0; +} + +void dbgDu( Selectable::Ptr sel ) +{ + if ( sel->installedPoolItem() ) + { + DBG << "i: " << sel->installedPoolItem() << endl + << sel->installedPoolItem()->diskusage() << endl; + } + if ( sel->candidatePoolItem() ) + { + DBG << "c: " << sel->candidatePoolItem() << endl + << sel->candidatePoolItem()->diskusage() << endl; + } + INT << sel << endl + << getZYpp()->diskUsage() << endl; +} + +/////////////////////////////////////////////////////////////////// + struct Xprint { bool operator()( const PoolItem & obj_r ) { - //handle( asKind<Package>( obj_r ) ); - //handle( asKind<Patch>( obj_r ) ); - handle( asKind<Pattern>( obj_r ) ); - handle( asKind<Product>( obj_r ) ); + handle( asKind<Package>( obj_r ) ); +// handle( asKind<Patch>( obj_r ) ); +// handle( asKind<Pattern>( obj_r ) ); +// handle( asKind<Product>( obj_r ) ); return true; } @@ -64,6 +95,7 @@ if ( !p ) return; + WAR << p->size() << endl; MIL << p->diskusage() << endl; } @@ -425,6 +457,25 @@ std::for_each( pool.begin(), pool.end(), Xprint() ); + DiskUsageCounter::MountPointSet fakePart; + fakePart.insert( DiskUsageCounter::MountPoint( "/", 1024, 10240, 5120, 0LL, false ) ); + getZYpp()->setPartitions( fakePart ); + + USR << getZYpp()->getPartitions() << endl; + INT << getZYpp()->diskUsage() << endl; + + Selectable::Ptr sel( getSel<Package>( "rpm" ) ); + dbgDu( sel ); + + MIL << sel->set_status( ui::S_Del ) << endl; + dbgDu( sel ); + + MIL << sel->set_status( ui::S_Update ) << endl; + dbgDu( sel ); + + MIL << sel->set_status( ui::S_KeepInstalled ) << endl; + dbgDu( sel ); + /////////////////////////////////////////////////////////////////// INT << "===[END]============================================" << endl << endl; zypp::base::LogControl::instance().logNothing(); Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?… ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Tue Sep 11 15:01:52 2007 @@ -4,6 +4,7 @@ - Don't fail if a product is deleted multiple times (e.g. due to obsoletes and an explicit deleted request). (#308746) - version 3.22.7 +- revision 7184 ------------------------------------------------------------------- Tue Sep 11 13:52:47 CEST 2007 - jkupec(a)suse.cz Modified: trunk/libzypp/zypp/DiskUsageCounter.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/DiskUsageCounter.cc… ============================================================================== --- trunk/libzypp/zypp/DiskUsageCounter.cc (original) +++ trunk/libzypp/zypp/DiskUsageCounter.cc Tue Sep 11 15:01:52 2007 @@ -305,7 +305,11 @@ std::ostream & operator<<( std::ostream & str, const DiskUsageCounter::MountPoint & obj ) { - str << "dir:[" << obj.dir << "] [ bs: " << obj.block_size << " ts: " << obj.total_size << "]" << std::endl; + str << "dir:[" << obj.dir << "] [ bs: " << obj.block_size + << " ts: " << obj.total_size + << " us: " << obj.used_size + << " +-: " << obj.pkg_size + << "]" << std::endl; return str; } Modified: trunk/libzypp/zypp/target/rpm/RpmPackageImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/target/rpm/RpmPacka… ============================================================================== --- trunk/libzypp/zypp/target/rpm/RpmPackageImpl.cc (original) +++ trunk/libzypp/zypp/target/rpm/RpmPackageImpl.cc Tue Sep 11 15:01:52 2007 @@ -56,6 +56,7 @@ // we know we are reading english. _description.setText(data->tag_description(), Locale("en")); data->tag_du(_disk_usage); + SEC << _disk_usage << endl; _location.setDownloadSize(data->tag_archivesize()); } @@ -199,7 +200,7 @@ } /** */ -const DiskUsage & RPMPackageImpl::diskUsage() const +const DiskUsage & RPMPackageImpl::diskusage() const { return _disk_usage; } Modified: trunk/libzypp/zypp/target/rpm/RpmPackageImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/target/rpm/RpmPacka… ============================================================================== --- trunk/libzypp/zypp/target/rpm/RpmPackageImpl.h (original) +++ trunk/libzypp/zypp/target/rpm/RpmPackageImpl.h Tue Sep 11 15:01:52 2007 @@ -85,7 +85,7 @@ /** */ virtual std::string type() const; /** */ - virtual const DiskUsage & diskUsage() const; + virtual const DiskUsage & diskusage() const; /** */ virtual Repository repository() const; -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r7184 - in /trunk/libzypp: VERSION.cmake package/libzypp.changes zypp/target/store/XMLFilesBackend.cc
by mlandres＠svn.opensuse.org 11 Sep '07

11 Sep '07

Author: mlandres Date: Tue Sep 11 15:01:30 2007 New Revision: 7184 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7184&view=rev Log: - Don't fail if a product is deleted multiple times (e.g. due to obsoletes and an explicit deleted request). (#308746) Modified: trunk/libzypp/VERSION.cmake trunk/libzypp/package/libzypp.changes trunk/libzypp/zypp/target/store/XMLFilesBackend.cc Modified: trunk/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=7184&r… ============================================================================== --- trunk/libzypp/VERSION.cmake (original) +++ trunk/libzypp/VERSION.cmake Tue Sep 11 15:01:30 2007 @@ -47,4 +47,4 @@ SET(LIBZYPP_MAJOR "3") SET(LIBZYPP_MINOR "22") SET(LIBZYPP_COMPATMINOR "21") -SET(LIBZYPP_PATCH "6") +SET(LIBZYPP_PATCH "7") Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?… ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Tue Sep 11 15:01:30 2007 @@ -1,19 +1,26 @@ ------------------------------------------------------------------- +Tue Sep 11 14:54:44 CEST 2007 - ma(a)suse.de + +- Don't fail if a product is deleted multiple times (e.g. due to + obsoletes and an explicit deleted request). (#308746) +- version 3.22.7 + +------------------------------------------------------------------- Tue Sep 11 13:52:47 CEST 2007 - jkupec(a)suse.cz -- SYSCONFDIR variable added for modifying /etc +- SYSCONFDIR variable added for modifying /etc ------------------------------------------------------------------- Tue Sep 11 12:18:11 CEST 2007 - schubi(a)suse.de - uninstallable resolvable -->suggested solution: delete; Bug 308164 -- r 7177 +- r 7177 ------------------------------------------------------------------- Mon Sep 10 16:19:05 CEST 2007 - schubi(a)suse.de - new translations added -- r 7166 +- r 7166 - version 3.22.6 ------------------------------------------------------------------- @@ -25,7 +32,7 @@ Mon Sep 10 14:17:29 CEST 2007 - schubi(a)suse.de - Splitting packages: Take the package with the best - architecture,edition ONLY; Bug 308591 + architecture,edition ONLY; Bug 308591 - r 7160 ------------------------------------------------------------------- Modified: trunk/libzypp/zypp/target/store/XMLFilesBackend.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/target/store/XMLFil… ============================================================================== --- trunk/libzypp/zypp/target/store/XMLFilesBackend.cc (original) +++ trunk/libzypp/zypp/target/store/XMLFilesBackend.cc Tue Sep 11 15:01:30 2007 @@ -47,9 +47,6 @@ #include <zypp/ZYpp.h> #include <zypp/PathInfo.h> -#include "boost/filesystem/operations.hpp" // includes boost/filesystem/path.hpp -#include "boost/filesystem/fstream.hpp" // ditto - #include "XMLFilesBackend.h" #include "serialize.h" @@ -59,7 +56,6 @@ using std::endl; using std::string; using std::list; -using namespace boost::filesystem; using namespace zypp; using namespace zypp::filesystem; @@ -258,7 +254,7 @@ for ( it_kinds = d->kinds.begin() ; it_kinds != d->kinds.end(); ++it_kinds ) { Resolvable::Kind kind = (*it_kinds); - bool isthere = exists(dirForResolvableKind(kind)); + bool isthere = PathInfo( dirForResolvableKind(kind) ).isExist(); ok = ok && isthere; } @@ -266,12 +262,12 @@ for ( it_kinds = d->kinds_flags.begin() ; it_kinds != d->kinds_flags.end(); ++it_kinds ) { Resolvable::Kind kind = (*it_kinds); - bool isthere = exists(dirForResolvableKindFlags(kind)); + bool isthere = PathInfo( dirForResolvableKindFlags(kind) ).isExist(); ok = ok && isthere; } // named flags - bool nmthere = exists(dirForNamedFlags()); + bool nmthere = PathInfo( dirForNamedFlags() ).isExist(); ok = ok && nmthere; return ok; @@ -328,25 +324,19 @@ std::string XMLFilesBackend::dirForResolvableKind( Resolvable::Kind kind ) const { - std::string dir; - dir += Pathname( d->root + Pathname(ZYPP_DB_DIR) + Pathname(resolvableKindToString(kind, true)) ).asString(); - return dir; + return Pathname( d->root + Pathname(ZYPP_DB_DIR) + Pathname(resolvableKindToString(kind, true)) ).asString(); } std::string XMLFilesBackend::dirForResolvableKindFlags( Resolvable::Kind kind ) const { - std::string dir; - dir += Pathname( d->root + Pathname(ZYPP_DB_DIR) + Pathname("flags") + Pathname(resolvableKindToString(kind, true)) ).asString(); - return dir; + return Pathname( d->root + Pathname(ZYPP_DB_DIR) + Pathname("flags") + Pathname(resolvableKindToString(kind, true)) ).asString(); } std::string XMLFilesBackend::dirForNamedFlags() const { - std::string dir; - dir += Pathname( d->root + Pathname(ZYPP_DB_DIR) + Pathname("named-flags")).asString(); - return dir; + return Pathname( d->root + Pathname(ZYPP_DB_DIR) + Pathname("named-flags")).asString(); } std::string @@ -385,7 +375,7 @@ std::string XMLFilesBackend::fullPathForResolvable( ResObject::constPtr resolvable ) const { - return path( path(dirForResolvable(resolvable)) / path(fileNameForResolvable(resolvable))).string(); + return( Pathname( dirForResolvable(resolvable) ) / fileNameForResolvable(resolvable) ).asString(); } std::string @@ -393,14 +383,14 @@ { std::stringstream key_stream(key); std::string key_encoded = Digest::digest("MD5", key_stream); - return path( path(dirForNamedFlags()) / path(key_encoded)).string(); + return( Pathname( dirForNamedFlags() ) / key_encoded ).asString(); } std::string XMLFilesBackend::fullPathForResolvableFlags( ResObject::constPtr resolvable ) const { // flags are in a hidden file with the same name - return path( path(dirForResolvableFlags(resolvable)) / path(fileNameForResolvable(resolvable))).string(); + return( Pathname( dirForResolvableFlags(resolvable) ) / fileNameForResolvable(resolvable) ).asString(); } void @@ -520,7 +510,7 @@ { std::set<std::string> _flags; // do we have previous saved flags? - if (!exists(path(filename))) + if ( ! PathInfo( filename ).isExist() ) return _flags; std::ifstream file(filename.c_str()); @@ -593,8 +583,8 @@ { try { - int ret = filesystem::unlink(Pathname(filename)); - if ( ret != 0 ) + int ret = filesystem::unlink( filename ); + if ( ret != 0 && ret != ENOENT ) { ERR << "Error removing resolvable file " << filename << std::endl; ZYPP_THROW(Exception("Error deleting " + filename.asString())); -- 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] r7183 - /trunk/updater-kde/package/opensuse-updater-kde.spec
by tgoettlicher＠svn.opensuse.org 11 Sep '07

11 Sep '07

Author: tgoettlicher Date: Tue Sep 11 14:46:05 2007 New Revision: 7183 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7183&view=rev Log: spec Modified: trunk/updater-kde/package/opensuse-updater-kde.spec 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 11 14:46:05 2007 @@ -90,6 +90,9 @@ %changelog -n opensuse-updater-kde ------------------------------------------------------------------- +* Mon Sep 10 2007 - tgoettlicher(a)suse.de +- fixed declining license does not abort (#308985) +- updated translations * Fri Sep 7 2007 - tgoettlicher(a)suse.de - fixed opensuse-updater should also offer Recommend updates by default (#308550) - fixed duplicated text in error message (#308125) @@ -158,3 +161,7 @@ + + + + -- 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] r7182 - /trunk/libzypp/package/libzypp.changes
by jkupec＠svn.opensuse.org 11 Sep '07

11 Sep '07

Author: jkupec Date: Tue Sep 11 13:53:32 2007 New Revision: 7182 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7182&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 Tue Sep 11 13:53:32 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Sep 11 13:52:47 CEST 2007 - jkupec(a)suse.cz + +- SYSCONFDIR variable added for modifying /etc + +------------------------------------------------------------------- Tue Sep 11 12:18:11 CEST 2007 - schubi(a)suse.de - uninstallable resolvable -->suggested solution: delete; Bug 308164 -- 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] r7181 - /trunk/libzypp/CMakeLists.txt
by jkupec＠svn.opensuse.org 11 Sep '07

11 Sep '07

Author: jkupec Date: Tue Sep 11 13:52:41 2007 New Revision: 7181 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7181&view=rev Log: - SYSCONFDIR variable added for /etc Modified: trunk/libzypp/CMakeLists.txt Modified: trunk/libzypp/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/CMakeLists.txt?rev=7181&… ============================================================================== --- trunk/libzypp/CMakeLists.txt (original) +++ trunk/libzypp/CMakeLists.txt Tue Sep 11 13:52:41 2007 @@ -10,6 +10,14 @@ SET ( LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" ) ENDIF ( DEFINED LIB ) MESSAGE(STATUS "Libraries will be installed in ${LIB_INSTALL_DIR}" ) + +# system configuration dir (etc) + +IF( NOT DEFINED SYSCONFDIR ) + SET( SYSCONFDIR /etc ) +ENDIF( NOT DEFINED SYSCONFDIR ) +MESSAGE(STATUS "Config files will be installed in ${SYSCONFDIR}" ) + #################################################################### # CONFIGURATION # #################################################################### @@ -206,8 +214,8 @@ MESSAGE(STATUS "FindZypp.cmake will be installed in ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules") INSTALL( FILES ${CMAKE_SOURCE_DIR}/cmake/modules/FindZypp.cmake DESTINATION ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules ) -MESSAGE(STATUS "zypp.conf will be installed in /etc/zypp") -INSTALL( FILES ${CMAKE_SOURCE_DIR}/zypp.conf DESTINATION /etc/zypp ) +MESSAGE(STATUS "zypp.conf will be installed in ${SYSCONFDIR}/zypp") +INSTALL( FILES ${CMAKE_SOURCE_DIR}/zypp.conf DESTINATION ${SYSCONFDIR}/zypp ) #################################################################### # SUBDIRECTORIES # -- 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] r7180 - in /trunk/libzypp/zypp: PathInfo.cc PathInfo.h
by mlandres＠svn.opensuse.org 11 Sep '07

11 Sep '07

Author: mlandres Date: Tue Sep 11 13:40:18 2007 New Revision: 7180 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7180&view=rev Log: Log filesystem operations as milestone Modified: trunk/libzypp/zypp/PathInfo.cc trunk/libzypp/zypp/PathInfo.h Modified: trunk/libzypp/zypp/PathInfo.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/PathInfo.cc?rev=718… ============================================================================== --- trunk/libzypp/zypp/PathInfo.cc (original) +++ trunk/libzypp/zypp/PathInfo.cc Tue Sep 11 13:40:18 2007 @@ -29,7 +29,7 @@ #include "zypp/PathInfo.h" #include "zypp/Digest.h" - +using std::endl; using std::string; /////////////////////////////////////////////////////////////////// @@ -292,10 +292,9 @@ */ inline int _Log_Result( const int res, const char * rclass = "errno" ) { + MIL << endl; if ( res ) - WAR << " FAILED: " << rclass << " " << res << std::endl; - else - DBG << std::endl; + WAR << " FAILED: " << rclass << " " << res << endl; return res; } @@ -306,7 +305,7 @@ // int mkdir( const Pathname & path, unsigned mode ) { - DBG << "mkdir " << path << ' ' << str::octstring( mode ); + MIL << "mkdir " << path << ' ' << str::octstring( mode ); if ( ::mkdir( path.asString().c_str(), mode ) == -1 ) { return _Log_Result( errno ); } @@ -334,20 +333,26 @@ else lastpos=1; - // DBG << "about to create " << spath << endl; + // MIL << "about to create " << spath << endl; while((pos = spath.find('/',lastpos)) != string::npos ) { string dir = spath.substr(0,pos); ret = ::mkdir(dir.c_str(), mode); if(ret == -1) + { + // ignore errors about already existing directorys + if(errno == EEXIST) + ret=0; + else { - // ignore errors about already existing directorys - if(errno == EEXIST) - ret=0; - else - ret=errno; + ret=errno; + WAR << " FAILED: mkdir " << path << ' ' << str::octstring( mode ) << " errno " << ret << endl; } - // DBG << "creating directory " << dir << (ret?" failed":" succeeded") << endl; + } + else + { + MIL << "mkdir " << path << ' ' << str::octstring( mode ); + } lastpos = pos+1; } return ret; @@ -360,7 +365,7 @@ // int rmdir( const Pathname & path ) { - DBG << "rmdir " << path; + MIL << "rmdir " << path; if ( ::rmdir( path.asString().c_str() ) == -1 ) { return _Log_Result( errno ); } @@ -374,7 +379,7 @@ // int recursive_rmdir( const Pathname & path ) { - DBG << "recursive_rmdir " << path << ' '; + MIL << "recursive_rmdir " << path << ' '; PathInfo p( path ); if ( !p.isExist() ) { @@ -392,7 +397,7 @@ } catch ( boost::filesystem::filesystem_error & excpt ) { - WAR << " FAILED: " << excpt.what() << std::endl; + WAR << " FAILED: " << excpt.what() << endl; return -1; } @@ -406,7 +411,7 @@ // int clean_dir( const Pathname & path ) { - DBG << "clean_dir " << path << ' '; + MIL << "clean_dir " << path << ' '; PathInfo p( path ); if ( !p.isExist() ) { @@ -420,7 +425,7 @@ string cmd( str::form( "cd '%s' && rm -rf --preserve-root -- *", path.asString().c_str() ) ); ExternalProgram prog( cmd, ExternalProgram::Stderr_To_Stdout ); for ( string output( prog.receiveLine() ); output.length(); output = prog.receiveLine() ) { - DBG << " " << output; + MIL << " " << output; } int ret = prog.close(); return _Log_Result( ret, "returned" ); @@ -433,7 +438,7 @@ // int copy_dir( const Pathname & srcpath, const Pathname & destpath ) { - DBG << "copy_dir " << srcpath << " -> " << destpath << ' '; + MIL << "copy_dir " << srcpath << " -> " << destpath << ' '; PathInfo sp( srcpath ); if ( !sp.isDir() ) { @@ -461,7 +466,7 @@ }; ExternalProgram prog( argv, ExternalProgram::Stderr_To_Stdout ); for ( string output( prog.receiveLine() ); output.length(); output = prog.receiveLine() ) { - DBG << " " << output; + MIL << " " << output; } int ret = prog.close(); return _Log_Result( ret, "returned" ); @@ -474,7 +479,7 @@ // int copy_dir_content(const Pathname & srcpath, const Pathname & destpath) { - DBG << "copy_dir " << srcpath << " -> " << destpath << ' '; + MIL << "copy_dir " << srcpath << " -> " << destpath << ' '; PathInfo sp( srcpath ); if ( !sp.isDir() ) { @@ -502,7 +507,7 @@ }; ExternalProgram prog( argv, ExternalProgram::Stderr_To_Stdout ); for ( string output( prog.receiveLine() ); output.length(); output = prog.receiveLine() ) { - DBG << " " << output; + MIL << " " << output; } int ret = prog.close(); return _Log_Result( ret, "returned" ); @@ -518,7 +523,7 @@ { retlist.clear(); - DBG << "readdir " << path << ' '; + MIL << "readdir " << path << ' '; DIR * dir = ::opendir( path.asString().c_str() ); if ( ! dir ) { @@ -624,7 +629,7 @@ // int unlink( const Pathname & path ) { - DBG << "unlink " << path; + MIL << "unlink " << path; if ( ::unlink( path.asString().c_str() ) == -1 ) { return _Log_Result( errno ); } @@ -638,7 +643,7 @@ // int rename( const Pathname & oldpath, const Pathname & newpath ) { - DBG << "rename " << oldpath << " -> " << newpath; + MIL << "rename " << oldpath << " -> " << newpath; if ( ::rename( oldpath.asString().c_str(), newpath.asString().c_str() ) == -1 ) { return _Log_Result( errno ); } @@ -652,7 +657,7 @@ // int copy( const Pathname & file, const Pathname & dest ) { - DBG << "copy " << file << " -> " << dest << ' '; + MIL << "copy " << file << " -> " << dest << ' '; PathInfo sp( file ); if ( !sp.isFile() ) { @@ -673,7 +678,7 @@ }; ExternalProgram prog( argv, ExternalProgram::Stderr_To_Stdout ); for ( string output( prog.receiveLine() ); output.length(); output = prog.receiveLine() ) { - DBG << " " << output; + MIL << " " << output; } int ret = prog.close(); return _Log_Result( ret, "returned" ); @@ -686,7 +691,7 @@ // int symlink( const Pathname & oldpath, const Pathname & newpath ) { - DBG << "symlink " << newpath << " -> " << oldpath; + MIL << "symlink " << newpath << " -> " << oldpath; if ( ::symlink( oldpath.asString().c_str(), newpath.asString().c_str() ) == -1 ) { return _Log_Result( errno ); } @@ -700,7 +705,7 @@ // int hardlink( const Pathname & oldpath, const Pathname & newpath ) { - DBG << "hardlink " << newpath << " -> " << oldpath; + MIL << "hardlink " << newpath << " -> " << oldpath; if ( ::link( oldpath.asString().c_str(), newpath.asString().c_str() ) == -1 ) { return _Log_Result( errno ); } @@ -714,7 +719,7 @@ // int copy_file2dir( const Pathname & file, const Pathname & dest ) { - DBG << "copy_file2dir " << file << " -> " << dest << ' '; + MIL << "copy_file2dir " << file << " -> " << dest << ' '; PathInfo sp( file ); if ( !sp.isFile() ) { @@ -735,7 +740,7 @@ }; ExternalProgram prog( argv, ExternalProgram::Stderr_To_Stdout ); for ( string output( prog.receiveLine() ); output.length(); output = prog.receiveLine() ) { - DBG << " " << output; + MIL << " " << output; } int ret = prog.close(); return _Log_Result( ret, "returned" ); @@ -816,7 +821,7 @@ // int chmod( const Pathname & path, mode_t mode ) { - DBG << "chmod " << path << ' ' << str::octstring( mode ); + MIL << "chmod " << path << ' ' << str::octstring( mode ); if ( ::chmod( path.asString().c_str(), mode ) == -1 ) { return _Log_Result( errno ); } @@ -886,7 +891,7 @@ // int touch (const Pathname & path) { - DBG << "touch " << path << std::endl; + MIL << "touch " << path; struct ::utimbuf times; times.actime = ::time( 0 ); times.modtime = ::time( 0 ); Modified: trunk/libzypp/zypp/PathInfo.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/PathInfo.h?rev=7180… ============================================================================== --- trunk/libzypp/zypp/PathInfo.h (original) +++ trunk/libzypp/zypp/PathInfo.h Tue Sep 11 13:40:18 2007 @@ -521,6 +521,14 @@ /** \name File related functions. */ //@{ /** + * Change file's modification and access times. + * + * \return 0 on success, errno on failure + * \see man utime + */ + int touch (const Pathname & path); + + /** * Like '::unlink'. Delete a file (symbolic link, socket, fifo or device). * * @return 0 on success, errno on failure @@ -659,14 +667,6 @@ { return mode_r & ~getUmask(); } //@} - /** - * Change file's modification and access times. - * - * \return 0 on success, errno on failure - * \see man utime - */ - int touch (const Pathname & path); - ///////////////////////////////////////////////////////////////// } // namespace filesystem /////////////////////////////////////////////////////////////////// -- 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] r7179 - /trunk/zypper/src/zypper-misc.cc
by jkupec＠svn.opensuse.org 11 Sep '07

11 Sep '07

Author: jkupec Date: Tue Sep 11 13:03:36 2007 New Revision: 7179 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7179&view=rev Log: - don't display the number of problems if only one found (#304283) Modified: trunk/zypper/src/zypper-misc.cc Modified: trunk/zypper/src/zypper-misc.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-misc.cc?rev=71… ============================================================================== --- trunk/zypper/src/zypper-misc.cc (original) +++ trunk/zypper/src/zypper-misc.cc Tue Sep 11 13:03:36 2007 @@ -488,13 +488,17 @@ e = rproblems.end (), i; ProblemSolutionList todo; - if (!rproblems.empty()) { + + // display the number of problems + if (rproblems.size() > 1) { stm << format (_("%s Problems:")) % rproblems.size() << endl; } - else { + else if (rproblems.empty()) { + // should not happen! If solve() failed at least one problem must be set! stm << _("Specified capability not found") << endl; return false; } + // for many problems, list them shortly first if (rproblems.size() > 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] r7178 - /trunk/libzypp/package/libzypp.changes
by schubi2＠svn.opensuse.org 11 Sep '07

11 Sep '07

Author: schubi2 Date: Tue Sep 11 12:18:31 2007 New Revision: 7178 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7178&view=rev Log: uninstallable resolvable -->suggested solution: delete; Bug 308164 Modified: trunk/libzypp/package/libzypp.changes Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?… ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Tue Sep 11 12:18:31 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Sep 11 12:18:11 CEST 2007 - schubi(a)suse.de + +- uninstallable resolvable -->suggested solution: delete; Bug 308164 +- r 7177 + +------------------------------------------------------------------- Mon Sep 10 16:19:05 CEST 2007 - schubi(a)suse.de - new translations added -- 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] r7177 - /trunk/libzypp/zypp/solver/detail/Resolver_problems.cc
by schubi2＠svn.opensuse.org 11 Sep '07

11 Sep '07

Author: schubi2 Date: Tue Sep 11 12:17:51 2007 New Revision: 7177 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7177&view=rev Log: uninstallable resolvable -->suggested solution: delete; Bug 308164 Modified: trunk/libzypp/zypp/solver/detail/Resolver_problems.cc Modified: trunk/libzypp/zypp/solver/detail/Resolver_problems.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Resol… ============================================================================== --- trunk/libzypp/zypp/solver/detail/Resolver_problems.cc (original) +++ trunk/libzypp/zypp/solver/detail/Resolver_problems.cc Tue Sep 11 12:17:51 2007 @@ -546,7 +546,7 @@ details = str::form (_("%s is not installed and has been marked as uninstallable"), who.c_str()) + "\n"; details += logAdditionalInfo(collector.additionalInfo, item); ResolverProblem_Ptr problem = new ResolverProblem (what, details); - problem->addSolution (new ProblemSolutionInstall (problem, item)); // Install resolvable again + problem->addSolution (new ProblemSolutionUninstall (problem, item)); // Uninstall resolvable problems.push_back (problem); problem_created = true; } -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0