Hello community, here is the log from the commit of package dice for openSUSE:Factory checked in at 2016-04-30 23:30:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-11-26 17:03:52.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.dice.new/dice.changes 2016-04-30 23:30:55.000000000 +0200 @@ -1,0 +2,27 @@ +Tue Apr 19 11:59:28 CEST 2016 - [email protected] + +- Run build and bundle in UTF-8 locale + +------------------------------------------------------------------- +Mon Apr 18 16:13:43 CEST 2016 - [email protected] + +- add option to skip dockerhub container update + +------------------------------------------------------------------- +Mon Apr 18 09:25:58 CEST 2016 - [email protected] + +- Move to kiwi next generation + +------------------------------------------------------------------- +Sun Apr 17 15:43:04 CEST 2016 - [email protected] + +- Fixed evaluation of yast2 dist URI's + +------------------------------------------------------------------- +Sun Apr 17 15:07:54 CEST 2016 - [email protected] + +- Fixed unit test for create_solv + + Check for raise condition was incomplete + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dice.spec ++++++ --- /var/tmp/diff_new_pack.LFUzaI/_old 2016-04-30 23:30:55.000000000 +0200 +++ /var/tmp/diff_new_pack.LFUzaI/_new 2016-04-30 23:30:55.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package dice # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed ++++++ dice-0.7.7.gem ++++++ Files old/checksums.yaml.gz and new/checksums.yaml.gz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/cli.rb new/lib/cli.rb --- old/lib/cli.rb 2015-11-16 15:09:34.000000000 +0100 +++ new/lib/cli.rb 2016-04-19 12:03:14.000000000 +0200 @@ -83,14 +83,26 @@ LONGDESC arg "RECIPE-PATH" command :build do |c| - c.switch ["force", :f], :required => false, :negatable => false, + c.switch ["force", :f], + :required => false, + :negatable => false, :desc => "Force building even if status is up to data" - c.switch ["skip-missing", :i], :required => false, :negatable => false, + c.switch ["skip-missing", :i], + :required => false, + :negatable => false, :desc => "Skip packages not found in the repositories" - c.flag ["kiwitype", :t], :kiwitype => String, :required => false, + c.flag ["kiwitype", :t], + :kiwitype => String, + :required => false, :desc => "Set kiwi build type" - c.flag ["kiwiprofile", :p], :kiwiprofile => String, :required => false, + c.flag ["kiwiprofile", :p], + :kiwiprofile => String, + :required => false, :desc => "Set kiwi build profile" + c.switch ["skip-container-update", :s], + :required => false, + :negatable => false, + :desc => "Skip build system container update from dockerhub" c.action do |global_options,options,args| Dice.setup_options(options) description = shift_arg(args, "RECIPE-PATH") @@ -111,7 +123,9 @@ LONGDESC arg "RECIPE-PATH" command :buildlog do |c| - c.switch ["show", :s], :required => false, :negatable => false, + c.switch ["show", :s], + :required => false, + :negatable => false, :desc => "Just show the log if present, skip test for build process" c.action do |global_options,options,args| Dice.setup_options(options) @@ -151,7 +165,9 @@ LONGDESC arg "RECIPE-PATH" command :status do |c| - c.switch ["skip-missing", :i], :required => false, :negatable => false, + c.switch ["skip-missing", :i], + :required => false, + :negatable => false, :desc => "Skip packages not found in the repositories" c.action do |global_options,options,args| Dice.setup_options(options) @@ -194,7 +210,9 @@ LONGDESC arg "RECIPE-PATH" command :cleanup do |c| - c.switch ["lock", :l], :required => false, :negatable => false, + c.switch ["lock", :l], + :required => false, + :negatable => false, :desc => "Cleanup stale semaphore lock if present" c.action do |global_options,options,args| Dice.setup_options(options) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/docker_build_system.rb new/lib/docker_build_system.rb --- old/lib/docker_build_system.rb 2015-11-16 15:09:34.000000000 +0100 +++ new/lib/docker_build_system.rb 2016-04-19 12:03:14.000000000 +0200 @@ -9,6 +9,9 @@ end def up + if Dice.option["skip-container-update"] + return + end Dice.logger.info( "#{self.class}: Pulling buildsystem from dockerhub #{recipe.basepath}..." ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/job.rb new/lib/job.rb --- old/lib/job.rb 2015-11-16 15:09:34.000000000 +0100 +++ new/lib/job.rb 2016-04-19 12:03:14.000000000 +0200 @@ -14,17 +14,19 @@ def build prepare_build Dice.logger.info("#{self.class}: Building...") - build_opts = "--build /vagrant -d /tmp/#{job_name} --logfile terminal" + build_opts = "--debug" if Dice.option.kiwitype build_opts += " --type #{Dice.option.kiwitype}" end if Dice.option.kiwiprofile - build_opts += " --add-profile #{Dice.option.kiwiprofile}" + build_opts += " --profile #{Dice.option.kiwiprofile}" end + build_opts += " system build" + + " --description /vagrant --target-dir /tmp/#{job_name}" logfile = File.open(build_log, "w") logfile.sync = true - kiwi_environment = "export KIWI_IGNORE_OLD_MOUNTS=1" - kiwi_command = "bash -c '#{kiwi_environment}; /usr/sbin/kiwi #{build_opts}'" + kiwi_environment = "LANG=en_US.UTF-8" + kiwi_command = "bash -c '#{kiwi_environment}; kiwi #{build_opts}'" begin Command.run( buildsystem.job_builder_command(kiwi_command), @@ -46,9 +48,11 @@ Dice.logger.info("#{self.class}: Bundle results...") logfile = File.open(build_log, "a") logfile.sync = true - bundle_opts = "--bundle-build /tmp/#{job_name} --bundle-id DiceBuild " + - "--destdir /tmp/#{bundle_name} --logfile terminal" - kiwi_command = "/usr/sbin/kiwi #{bundle_opts}" + bundle_opts = "--target-dir /tmp/#{job_name} --id DiceBuild " + + "--bundle-dir /tmp/#{bundle_name}" + kiwi_environment = "LANG=en_US.UTF-8" + kiwi_command = "bash -c '#{kiwi_environment}; "+ + "kiwi result bundle #{bundle_opts}'" begin Command.run( buildsystem.job_builder_command(kiwi_command), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/kiwi_uri.rb new/lib/kiwi_uri.rb --- old/lib/kiwi_uri.rb 2015-11-16 15:09:34.000000000 +0100 +++ new/lib/kiwi_uri.rb 2016-04-19 12:03:14.000000000 +0200 @@ -4,18 +4,24 @@ # normalize url types available in a kiwi configuration into # standard mime types. This also includes resolving open build # service resource locator into http addresses - case args[:name] - when /^obs:\/\/(\d.*)/ + if args[:repo_type] == "yast2" # distribution URL pointing to a yast distro repo - args[:name] = "http://download.opensuse.org/distribution/#{$1}/"; - when /^obs:\/\/(.*)/ - # obs url, translate to http url - bs_path = $1.gsub(/:/, ":/") - bs_path = bs_path.gsub(/:\/\//, ":/") - args[:name] = "http://download.opensuse.org/repositories/#{bs_path}"; - when /^(\/.*)/ - # Simple path, should be a distribution dir - args[:name] = "dir://#{$1}/" + bs_project = args[:name].gsub(/obs:\/\//, "") + args[:name] = "http://download.opensuse.org/distribution/#{bs_project}/"; + else + case args[:name] + when /^obs:\/\/(\d.*)/ + # distribution URL pointing to a rpm-md distro repo + args[:name] = "http://download.opensuse.org/distribution/#{$1}/"; + when /^obs:\/\/(.*)/ + # obs url, translate to http url + bs_path = $1.gsub(/:/, ":/") + bs_path = bs_path.gsub(/:\/\//, ":/") + args[:name] = "http://download.opensuse.org/repositories/#{bs_path}"; + when /^(\/.*)/ + # Simple path, should be a distribution dir + args[:name] = "dir://#{$1}/" + end end RepoUri.new(args) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metadata new/metadata --- old/metadata 2015-11-16 15:09:34.000000000 +0100 +++ new/metadata 2016-04-19 12:03:14.000000000 +0200 @@ -8,7 +8,7 @@ autorequire: bindir: bin cert_chain: [] -date: 2015-11-16 00:00:00.000000000 Z +date: 2016-04-19 00:00:00.000000000 Z dependencies: - !ruby/object:Gem::Dependency name: cheetah
