Author: aschnell Date: Fri Aug 24 15:56:22 2007 New Revision: 6874 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6874&view=rev Log: - more checksum stuff Added: trunk/repotools/zypptools/lib/utils.rb Modified: trunk/repotools/zypptools/lib/CMakeLists.txt trunk/repotools/zypptools/output/yast.rb trunk/repotools/zypptools/output/yum.rb Modified: trunk/repotools/zypptools/lib/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/repotools/zypptools/lib/CMakeLists.txt?rev=6874&r1=6873&r2=6874&view=diff ============================================================================== --- trunk/repotools/zypptools/lib/CMakeLists.txt (original) +++ trunk/repotools/zypptools/lib/CMakeLists.txt Fri Aug 24 15:56:22 2007 @@ -1,6 +1,7 @@ SET(FILES arch.rb database.rb db.rb dependency.rb hasher.rb package.rb - patch.rb pattern.rb product.rb repo.rb resolvable.rb selection.rb) + patch.rb pattern.rb product.rb repo.rb resolvable.rb selection.rb + utils.rb) INSTALL(FILES ${FILES} DESTINATION "${RUBY_VENDOR_LIB_PATH}/zypptools/lib") Added: trunk/repotools/zypptools/lib/utils.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/repotools/zypptools/lib/utils.rb?rev=6874&view=auto ============================================================================== --- trunk/repotools/zypptools/lib/utils.rb (added) +++ trunk/repotools/zypptools/lib/utils.rb Fri Aug 24 15:56:22 2007 @@ -0,0 +1,15 @@ + +module ZYppTools + + def file_sha1sum(file) + checksum = 'deadbeaf' + IO.popen('sha1sum ' + file) {|pipe| checksum = pipe.gets.chomp} + return checksum[0,40] + end + + def file_mtime(file) + stat = File.stat(file) + return stat.mtime + end + +end Modified: trunk/repotools/zypptools/output/yast.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/repotools/zypptools/output/yast.rb?rev=6874&r1=6873&r2=6874&view=diff ============================================================================== --- trunk/repotools/zypptools/output/yast.rb (original) +++ trunk/repotools/zypptools/output/yast.rb Fri Aug 24 15:56:22 2007 @@ -3,6 +3,7 @@ # aschnell@suse.de require 'fileutils' +require 'zypptools/lib/utils' module ZYppTools @@ -144,8 +145,8 @@ out.puts "FLAGS update" out.puts "LANGUAGE en_US" out.puts "TIMEZONE America/Los_Angeles" - out.puts "META SHA1 212972603f088eaf67875b945bd9d6aab37f3e5d packages" - out.puts "META SHA1 cc9fcbe9f844f90af4d067d3b7190fbb0785e2c2 packages.en" + out.puts "META SHA1 " + file_sha1sum(@path + "/suse/setup/descr/packages") + " packages" + out.puts "META SHA1 " + file_sha1sum(@path + "/suse/setup/descr/packages.en") + " packages.en" out.close() end Modified: trunk/repotools/zypptools/output/yum.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/repotools/zypptools/output/yum.rb?rev=6874&r1=6873&r2=6874&view=diff ============================================================================== --- trunk/repotools/zypptools/output/yum.rb (original) +++ trunk/repotools/zypptools/output/yum.rb Fri Aug 24 15:56:22 2007 @@ -4,6 +4,7 @@ # aschnell@suse.de require 'fileutils' +require 'zypptools/lib/utils' require 'rexml/document' include REXML @@ -36,18 +37,6 @@ end - def file_sha1sum(file) - checksum = 'deadbeaf' - IO.popen('sha1sum ' + file) {|pipe| checksum = pipe.gets.chomp} - return checksum[0,40] - end - - def file_mtime(file) - stat = File.stat(file) - return stat.mtime - end - - def write_repomd() doc = Document.new -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org