January 2008 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r8177 - in /trunk/libzypp: tests/zypp/PathInfo.cc zypp/PathInfo.cc zypp/PathInfo.h
by jkupec＠svn.opensuse.org 02 Jan '08

02 Jan '08

Author: jkupec Date: Wed Jan 2 18:02:39 2008 New Revision: 8177 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8177&view=rev Log: - expandlink(Pathname) added - TODO: could be made so that it throws on bad links (better error reporting) - TODO: cyclic links protection can be improved by remembering paths alredy visited and checking them (again better error reporting and performance) Modified: trunk/libzypp/tests/zypp/PathInfo.cc trunk/libzypp/zypp/PathInfo.cc trunk/libzypp/zypp/PathInfo.h Modified: trunk/libzypp/tests/zypp/PathInfo.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/PathInfo.cc?r… ============================================================================== --- trunk/libzypp/tests/zypp/PathInfo.cc (original) +++ trunk/libzypp/tests/zypp/PathInfo.cc Wed Jan 2 18:02:39 2008 @@ -71,13 +71,59 @@ void pathinfo_misc_test() { TmpDir dir; - - - + PathInfo info(dir.path()); BOOST_CHECK(info.isDir()); } +void pathinfo_expandlink_test() +{ + TmpDir dir; + + // ---- not a link + + // create a file + Pathname file(dir / "file"); + ofstream str(file.asString().c_str(),ofstream::out); + str << "foo bar" << endl; + str.flush(); + str.close(); + + // expandlink should return the original Pathname if it does not point to a link + BOOST_CHECK_EQUAL( file, filesystem::expandlink(file) ); + + // ---- valid link + + // create a link to that file + Pathname link1(dir / "link1"); + BOOST_CHECK_EQUAL( filesystem::symlink(file, link1), 0); + + // does the link expand to the file? + BOOST_CHECK_EQUAL( file, filesystem::expandlink(link1) ); + + // ---- broken link + + // create a link to a non-existent file + Pathname brokenlink(dir / "brokenlink"); + Pathname non_existent(dir / "non-existent"); + BOOST_CHECK_EQUAL( filesystem::symlink(non_existent, brokenlink), 0); + PathInfo info(brokenlink, PathInfo::LSTAT); + BOOST_CHECK(info.isLink()); + + // expandlink should return an empty Pathname for a broken link + BOOST_CHECK_EQUAL( Pathname(), filesystem::expandlink(brokenlink) ); + + // ---- cyclic link + + // make the 'non-existent' a link to 'brokenlink' :O) + BOOST_CHECK_EQUAL( filesystem::symlink(brokenlink, non_existent), 0); + // expandlink should return an empty Pathname for such a cyclic link + BOOST_CHECK_EQUAL( Pathname(), filesystem::expandlink(brokenlink) ); + BOOST_CHECK_EQUAL( Pathname(), filesystem::expandlink(non_existent) ); + + cout << brokenlink << " -> " << filesystem::expandlink(brokenlink) << endl; +} + test_suite* init_unit_test_suite( int, char* [] ) { @@ -85,6 +131,7 @@ test->add( BOOST_TEST_CASE( &pathinfo_checksum_test ), 0 /* expected zero error */ ); test->add( BOOST_TEST_CASE( &pathinfo_misc_test ), 0 /* expected zero error */ ); test->add( BOOST_TEST_CASE( &pathinfo_is_exist_test ), 0 /* expected zero error */ ); + test->add( BOOST_TEST_CASE( &pathinfo_expandlink_test ), 0 /* expected zero error */ ); return test; } Modified: trunk/libzypp/zypp/PathInfo.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/PathInfo.cc?rev=817… ============================================================================== --- trunk/libzypp/zypp/PathInfo.cc (original) +++ trunk/libzypp/zypp/PathInfo.cc Wed Jan 2 18:02:39 2008 @@ -756,6 +756,50 @@ /////////////////////////////////////////////////////////////////// // + // METHOD NAME : expandlink + // METHOD TYPE : Pathname + // + Pathname expandlink( const Pathname & path_r ) + { + static const unsigned int level_limit = 256; + static unsigned int count; + Pathname path(path_r); + PathInfo info(path_r, PathInfo::LSTAT); + + for (count = level_limit; info.isLink() && count; count--) + { + DBG << "following symlink " << path << std::endl; + path = readlink(path); + info = PathInfo(path, PathInfo::LSTAT); + } + + // expand limit reached + if (count == 0) + { + ERR << "Expand level limit reached. Probably a cyclic symbolic link." << endl; + return Pathname(); + } + // symlink + else if (count < level_limit) + { + // check for a broken link + if (PathInfo(path).isExist()) + return path; + // broken link, return and empty path + else + { + ERR << path << " is broken (expanded from " << path_r << ")" << endl; + return Pathname(); + } + } + + // not a symlink, return the original pathname + DBG << "not a symlink" << endl; + return path; + } + + /////////////////////////////////////////////////////////////////// + // // METHOD NAME : copy_file2dir // METHOD TYPE : int // Modified: trunk/libzypp/zypp/PathInfo.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/PathInfo.h?rev=8177… ============================================================================== --- trunk/libzypp/zypp/PathInfo.h (original) +++ trunk/libzypp/zypp/PathInfo.h Wed Jan 2 18:02:39 2008 @@ -582,6 +582,20 @@ } /** + * Recursively follows the symlink pointed to by \a path_r and returns + * the Pathname to the real file or directory pointed to by the link. + * + * There is a recursion limit of 256 iterations to protect against a cyclic + * link. + * + * @return Pathname of the file or directory pointed to by the given link + * if it is a valid link. If \a path_r is not a link, an exact copy of + * it is returned. If \a path_r is a broken or a cyclic link, an empty + * Pathname is returned and the event logged. + */ + Pathname expandlink( const Pathname & path_r ); + + /** * Like 'cp file dest'. Copy file to dest dir. * * @return 0 on success, EINVAL if file is not a file, ENOTDIR if dest -- 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] r8176 - in /trunk/updater-kde/package: opensuse-updater-kde.changes opensuse-updater-kde.spec
by tgoettlicher＠svn.opensuse.org 02 Jan '08

02 Jan '08

Author: tgoettlicher Date: Wed Jan 2 16:04:16 2008 New Revision: 8176 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8176&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 Wed Jan 2 16:04:16 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jan 2 15:55:10 CET 2008 - tgoettlicher(a)suse.de + +- applied timing patch +- V 0.6.3 + +------------------------------------------------------------------- Wed Jan 2 15:52:38 CET 2008 - tgoettlicher(a)suse.de - fixed initialized pointer (#348614) @@ -13,7 +19,7 @@ ------------------------------------------------------------------- Thu Nov 15 16:38:31 CET 2007 - tgoettlicher(a)suse.de -- radded option to enable/disable icon animation when checking +- added option to enable/disable icon animation when checking - r7827 ------------------------------------------------------------------- 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 Wed Jan 2 16:04:16 2008 @@ -15,7 +15,7 @@ License: GPL Group: System/Management Summary: KDE updater applet for OpenSUSE -Version: 0.6.1 +Version: 0.6.3 Release: 1 URL: http://en.opensuse.org/KDE_Updater_Applet BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -90,6 +90,13 @@ %changelog -n opensuse-updater-kde ------------------------------------------------------------------ + +* Wed Jan 01 2008 - tgoettlicher(a)suse.de +- applied timing patch +- fixed initialized pointer (#348614) +- fixed confusing wording update v upgrades (#335566) +- added option to enable/disable icon animation when checking +- fixed update check starts again with new kde session (#331651) * Mon Nov 12 2007 - tgoettlicher(a)suse.de - added option to always show the details (#305109) - enhanced "add/remove update-reporsitory" functionality (#334499) @@ -188,4 +195,3 @@ - -- 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] r8175 - /trunk/updater-kde/package/opensuse-updater-kde.changes
by tgoettlicher＠svn.opensuse.org 02 Jan '08

02 Jan '08

Author: tgoettlicher Date: Wed Jan 2 15:59:33 2008 New Revision: 8175 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8175&view=rev Log: changes Modified: trunk/updater-kde/package/opensuse-updater-kde.changes 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 Wed Jan 2 15:59:33 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jan 2 15:52:38 CET 2008 - tgoettlicher(a)suse.de + +- fixed initialized pointer (#348614) +- r8174 + +------------------------------------------------------------------- Fri Nov 23 14:17:28 CET 2007 - tgoettlicher(a)suse.de - fixed confusing wording update v upgrades (#335566) -- 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] r8174 - /trunk/updater-kde/updater/simpleview.cpp
by tgoettlicher＠svn.opensuse.org 02 Jan '08

02 Jan '08

Author: tgoettlicher Date: Wed Jan 2 15:58:07 2008 New Revision: 8174 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8174&view=rev Log: fixed uninitialized pointer (#348614) Modified: trunk/updater-kde/updater/simpleview.cpp Modified: trunk/updater-kde/updater/simpleview.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/simpleview.c… ============================================================================== --- trunk/updater-kde/updater/simpleview.cpp (original) +++ trunk/updater-kde/updater/simpleview.cpp Wed Jan 2 15:58:07 2008 @@ -241,7 +241,7 @@ if (recommendedCount > 0 ) { - if ( _detailWindow->getUpdaterCapabilities().canSelectIndividualUpdates ) + if ( _detailWindow && _detailWindow->getUpdaterCapabilities().canSelectIndividualUpdates ) { recommended->setText(i18n("Install %n recommended update additionally", "Install %n recommended updates additionally", recommendedCount)); -- 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] r8173 - /trunk/sat-solver/bindings/satsolver.i
by kkaempf＠svn.opensuse.org 02 Jan '08

02 Jan '08

Author: kkaempf Date: Wed Jan 2 14:25:11 2008 New Revision: 8173 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8173&view=rev Log: document origin of file typemap fix id2str, str2id names Modified: trunk/sat-solver/bindings/satsolver.i Modified: trunk/sat-solver/bindings/satsolver.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/satsolver.i?… ============================================================================== --- trunk/sat-solver/bindings/satsolver.i (original) +++ trunk/sat-solver/bindings/satsolver.i Wed Jan 2 14:25:11 2008 @@ -241,15 +241,16 @@ /* types and typemaps */ #if defined(SWIGRUBY) -%typemap(in) FILE* { +/* copied from /usr/share/swig/ruby/file.i */ +%typemap(in) FILE *READ_NOCHECK { OpenFile *fptr; Check_Type($input, T_FILE); GetOpenFile($input, fptr); /*rb_io_check_writable(fptr);*/ $1 = GetReadFile(fptr); + rb_read_check($1) } - #endif typedef int Id; @@ -342,10 +343,12 @@ /* * Name management */ + %rename( "str2id" ) str2id( const char *name ); Id str2id( const char *name ) { return str2id( $self, name, 1 ); } + %rename( "id2str" ) id2str( Id id ); const char *id2str( Id id ) { return my_id2str( $self, id ); -- 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] r8172 - /trunk/sat-solver/bindings/python/CMakeLists.txt
by kkaempf＠svn.opensuse.org 02 Jan '08

02 Jan '08

Author: kkaempf Date: Wed Jan 2 14:21:05 2008 New Revision: 8172 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8172&view=rev Log: enable autodoc feature Modified: trunk/sat-solver/bindings/python/CMakeLists.txt Modified: trunk/sat-solver/bindings/python/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/python/CMake… ============================================================================== --- trunk/sat-solver/bindings/python/CMakeLists.txt (original) +++ trunk/sat-solver/bindings/python/CMakeLists.txt Wed Jan 2 14:21:05 2008 @@ -21,7 +21,7 @@ ADD_CUSTOM_COMMAND ( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/libsatsolver_wrap.c COMMAND ${CMAKE_COMMAND} -E echo_append "Creating wrapper code for Python ..." - COMMAND ${SWIG_EXECUTABLE} -python -o ${CMAKE_CURRENT_BINARY_DIR}/libsatsolver_wrap.c -I${CMAKE_SOURCE_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR}/../satsolver.i + COMMAND ${SWIG_EXECUTABLE} -python -features autodoc -o ${CMAKE_CURRENT_BINARY_DIR}/libsatsolver_wrap.c -I${CMAKE_SOURCE_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR}/../satsolver.i COMMAND ${CMAKE_COMMAND} -E echo "Done." WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../*.i -- 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] r8171 - /trunk/sat-solver/bindings/ruby/CMakeLists.txt
by kkaempf＠svn.opensuse.org 02 Jan '08

02 Jan '08

Author: kkaempf Date: Wed Jan 2 14:20:01 2008 New Revision: 8171 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8171&view=rev Log: enable autodoc Modified: trunk/sat-solver/bindings/ruby/CMakeLists.txt Modified: trunk/sat-solver/bindings/ruby/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/CMakeLi… ============================================================================== --- trunk/sat-solver/bindings/ruby/CMakeLists.txt (original) +++ trunk/sat-solver/bindings/ruby/CMakeLists.txt Wed Jan 2 14:20:01 2008 @@ -12,7 +12,7 @@ ADD_CUSTOM_COMMAND ( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/libsatsolver_wrap.c COMMAND ${CMAKE_COMMAND} -E echo_append "Creating wrapper code for Ruby..." - COMMAND ${SWIG_EXECUTABLE} -ruby -autorename -o ${CMAKE_CURRENT_BINARY_DIR}/libsatsolver_wrap.c -I${CMAKE_SOURCE_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR}/../satsolver.i + COMMAND ${SWIG_EXECUTABLE} -ruby -features autodoc -autorename -o ${CMAKE_CURRENT_BINARY_DIR}/libsatsolver_wrap.c -I${CMAKE_SOURCE_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR}/../satsolver.i COMMAND ${CMAKE_COMMAND} -E echo "Done." WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../*.i -- 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] r8170 - /trunk/sat-solver/bindings/ruby/tests/transaction.rb
by kkaempf＠svn.opensuse.org 02 Jan '08

02 Jan '08

Author: kkaempf Date: Wed Jan 2 14:18:39 2008 New Revision: 8170 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8170&view=rev Log: fix name Modified: trunk/sat-solver/bindings/ruby/tests/transaction.rb Modified: trunk/sat-solver/bindings/ruby/tests/transaction.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/t… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/transaction.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/transaction.rb Wed Jan 2 14:18:39 2008 @@ -32,7 +32,7 @@ when SatSolver::REMOVE_SOLVABLE_PROVIDES: "remove by relation" else "<NONE>" end - puts "#{cmd}: #{pool.idname(a.id)}" + puts "#{cmd}: #{pool.id2str(a.id)}" } transaction.clear! assert transaction.empty? -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0