Hello community, here is the log from the commit of package dice for openSUSE:Factory checked in at 2015-11-08 11:26:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dice (Old) and /work/SRC/openSUSE:Factory/.dice.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dice" Changes: -------- --- /work/SRC/openSUSE:Factory/dice/dice.changes 2015-08-05 19:15:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dice.new/dice.changes 2015-11-08 11:27:04.000000000 +0100 @@ -1,0 +2,14 @@ +Fri Oct 30 10:52:51 CET 2015 - [email protected] + +- minor version bump + +------------------------------------------------------------------- +Fri Oct 30 10:48:53 CET 2015 - [email protected] + +- Fixed solvable creation + + If multiple solver items are present each needs to be its + own solvable in order to become merged later. The *2solv + tools does not support multiple input files + +------------------------------------------------------------------- Old: ---- dice-0.7.3.gem New: ---- dice-0.7.4.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dice.spec ++++++ --- /var/tmp/diff_new_pack.nIyDSt/_old 2015-11-08 11:27:05.000000000 +0100 +++ /var/tmp/diff_new_pack.nIyDSt/_new 2015-11-08 11:27:05.000000000 +0100 @@ -17,7 +17,7 @@ Name: dice -Version: 0.7.3 +Version: 0.7.4 Release: 0 %define mod_name dice %define mod_full_name %{mod_name}-%{version} ++++++ dice-0.7.3.gem -> dice-0.7.4.gem ++++++ Files old/checksums.yaml.gz and new/checksums.yaml.gz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/repository_base.rb new/lib/repository_base.rb --- old/lib/repository_base.rb 2015-07-29 10:02:58.000000000 +0200 +++ new/lib/repository_base.rb 2015-10-30 10:53:12.000000000 +0100 @@ -71,27 +71,32 @@ source_dir = args[:source_dir] dest_dir = args[:dest_dir] FileUtils.mkdir_p(dest_dir) - rand_name = "solvable-" + (0...8).map { (65 + Kernel.rand(26)).chr }.join - solvable = File.open(dest_dir + "/" + rand_name, "wb") begin if tool == 'rpms2solv' + solvable = File.open(dest_dir + "/" + rand_solvable_name, "wb") Command.run( "bash", "-c", "#{tool} #{source_dir}/*.rpm", :stdout => solvable ) + solvable.close else - Command.run( - "bash", "-c", "gzip -cd --force #{source_dir}/* | #{tool}", - :stdout => solvable - ) + solv_files = Dir.glob(source_dir + "/*") + solv_files.each do |solv| + next if File.directory?(solv) + next if solv =~ /.rpm$/ + solvable = File.open(dest_dir + "/" + rand_solvable_name, "wb") + Command.run( + "bash", "-c", "gzip -cd --force #{solv} | #{tool}", + :stdout => solvable + ) + solvable.close + end end rescue Cheetah::ExecutionFailed => e raise Dice::Errors::SolvToolFailed.new( "Creating solvable failed: #{e.stderr}" ) end - solvable.close - rand_name end def merge_solv(source_dir, timestamp = "static") @@ -150,6 +155,10 @@ private + def rand_solvable_name + return "solvable-" + (0...8).map { (65 + Kernel.rand(26)).chr }.join + end + def check_404_header(source, dest) outfile = File.open(dest, "rb") # if there is a 404 not found information it will be in the first two lines diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/version.rb new/lib/version.rb --- old/lib/version.rb 2015-07-29 10:02:58.000000000 +0200 +++ new/lib/version.rb 2015-10-30 10:53:12.000000000 +0100 @@ -1,3 +1,3 @@ module Dice - VERSION = "0.7.3" + VERSION = "0.7.4" end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metadata new/metadata --- old/metadata 2015-07-29 10:02:58.000000000 +0200 +++ new/metadata 2015-10-30 10:53:12.000000000 +0100 @@ -1,14 +1,14 @@ --- !ruby/object:Gem::Specification name: dice version: !ruby/object:Gem::Version - version: 0.7.3 + version: 0.7.4 platform: ruby authors: - SUSE autorequire: bindir: bin cert_chain: [] -date: 2015-07-29 00:00:00.000000000 Z +date: 2015-10-30 00:00:00.000000000 Z dependencies: - !ruby/object:Gem::Dependency name: cheetah
