Hello community, here is the log from the commit of package golang-packaging for openSUSE:Factory checked in at 2016-01-20 09:55:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/golang-packaging (Old) and /work/SRC/openSUSE:Factory/.golang-packaging.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "golang-packaging" Changes: -------- --- /work/SRC/openSUSE:Factory/golang-packaging/golang-packaging.changes 2016-01-12 16:13:34.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.golang-packaging.new/golang-packaging.changes 2016-01-20 09:55:17.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Jan 19 10:36:14 UTC 2016 - [email protected] + +- update version 14.3 + * fix: command not found error for go test on SLE + * fix #5 again: gsub importpath itself is not enough + +------------------------------------------------------------------- Old: ---- golang-packaging-14.2.tar.gz New: ---- golang-packaging-14.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ golang-packaging.spec ++++++ --- /var/tmp/diff_new_pack.2vOuos/_old 2016-01-20 09:55:18.000000000 +0100 +++ /var/tmp/diff_new_pack.2vOuos/_new 2016-01-20 09:55:18.000000000 +0100 @@ -17,7 +17,7 @@ Name: golang-packaging -Version: 14.2 +Version: 14.3 Release: 0 Summary: A toolchain to help packaging golang License: GPL-3.0 @@ -56,7 +56,7 @@ %files %defattr(-,root,root) -%doc COPYING README.md TODO ChangeLog +%doc COPYING README.md ChangeLog %config %{_sysconfdir}/rpm/macros.go %if %{?suse_version} >= 1320 %{_prefix}/lib/rpm/fileattrs/golang.attr ++++++ golang-packaging-14.2.tar.gz -> golang-packaging-14.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/golang-packaging-14.2/ChangeLog new/golang-packaging-14.3/ChangeLog --- old/golang-packaging-14.2/ChangeLog 2016-01-11 12:16:49.000000000 +0100 +++ new/golang-packaging-14.3/ChangeLog 2016-01-19 11:33:28.000000000 +0100 @@ -1,3 +1,16 @@ +== update version 14.3 == + + * fix: command not found error for go test on SLE + * fix #5 again: gsub importpath itself is not enough + +== update version 14.2 == + + * golang.req: fix ' // indirect' comment in import + +== update version 14.1 == + + * fix: uniq! returns nil if everything is unique + == update version 14 == * if importpath has "test/example", it should survive (github#5) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/golang-packaging-14.2/TODO new/golang-packaging-14.3/TODO --- old/golang-packaging-14.2/TODO 2016-01-11 12:16:49.000000000 +0100 +++ new/golang-packaging-14.3/TODO 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -# TODO - -* multithreading diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/golang-packaging-14.2/golang/cli.rb new/golang-packaging-14.3/golang/cli.rb --- old/golang-packaging-14.2/golang/cli.rb 2016-01-11 12:16:49.000000000 +0100 +++ new/golang-packaging-14.3/golang/cli.rb 2016-01-19 11:33:28.000000000 +0100 @@ -1,19 +1,32 @@ module CLI - def self.run(command="") - - # echo the command we run to the buildlog - puts command - - IO.popen(command) {|f| f.each_line {|l| puts l}} - - if $? == 0 - File.open("/tmp/exitstatus.txt","w:UTF-8") {|f| f.puts(0)} + def write_status(status) + file = "/tmp/exitstatus.txt" + mode = "w:UTF-8" + if status == 0 + File.open(file,mode) {|f| f.puts(0)} else - File.open("/tmp/exitstatus.txt","w:UTF-8") {|f| f.puts(1)} + File.open(file,mode) {|f| f.puts(1)} abort "[ERROR]Go command failed! Please check." end + end + def self.run(env={},cmd="") + unless RUBY_VERSION.to_f > 1.8 + # popen in 1.8 doesn't support env hash + def popen_env(hash, cmd) + hash.each do |k,v| + ENV[k] = v + end + io = IO.popen(cmd) + io.close + write_status($?) + end + popen_env(env,cmd) {|f| f.each_line {|l| puts l}} + else + IO.popen(env,cmd) {|f| f.each_line {|l| puts l}} + write_status($?) + end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/golang-packaging-14.2/golang-macros.rb new/golang-packaging-14.3/golang-macros.rb --- old/golang-packaging-14.2/golang-macros.rb 2016-01-11 12:16:49.000000000 +0100 +++ new/golang-packaging-14.3/golang-macros.rb 2016-01-19 11:33:28.000000000 +0100 @@ -104,14 +104,14 @@ # MODs: nil, "...", "/...", "foo...", "foo/...", "foo bar", "foo bar... baz" and etc if mods.empty? - CLI.run("GOPATH=\"#{gopath}\" GOBIN=\"#{gobin}\" go install #{extraflags} #{buildflags} #{importpath}") + CLI.run({"GOPATH"=>gopath,"GOBIN"=>gobin}, "go install #{extraflags} #{buildflags} #{importpath}") else for mod in mods do if mod == "..." - CLI.run("GOPATH=\"#{gopath}\" GOBIN=\"#{gobin}\" go install #{extraflags} #{buildflags} #{importpath}...") + CLI.run({"GOPATH"=>gopath,"GOBIN"=>gobin}, "go install #{extraflags} #{buildflags} #{importpath}...") break else - CLI.run("GOPATH=\"#{gopath}\" GOBIN=\"#{gobin}\" go install #{extraflags} #{buildflags} #{importpath}/#{mod}") + CLI.run({"GOPATH"=>gopath,"GOBIN"=>gobin}, "go install #{extraflags} #{buildflags} #{importpath}/#{mod}") end end end @@ -187,7 +187,7 @@ puts "[ERROR]gofix: please specify a valid importpath, see: go help fix" else gopath = $builddir + "/go" - CLI.run("GOPATH=#{gopath} go fix #{ARGV[1]}...") + CLI.run({"GOPATH"=>gopath},"go fix #{ARGV[1]}...") end puts "Fixed!" @@ -204,7 +204,7 @@ puts "[ERROR]gotest: please specify a valid importpath, see: go help test" else gopath = $builddir + "/go:" + $libdir + "/go/contrib" - CLI.run("GOPATH=#{gopath} go test -x #{ARGV[1]}...") + CLI.run({"GOPATH"=>gopath}, "go test -x #{ARGV[1]}...") end puts "Test passed!" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/golang-packaging-14.2/golang.prov new/golang-packaging-14.3/golang.prov --- old/golang-packaging-14.2/golang.prov 2016-01-11 12:16:49.000000000 +0100 +++ new/golang-packaging-14.3/golang.prov 2016-01-19 11:33:28.000000000 +0100 @@ -9,10 +9,11 @@ # read stdin for filelist rpm feeds us for a (sub) package filelist = [] +prefix = buildroot + contribdir + "/" ARGF.each do |l| # if line has "*.a" # buildroot + contribdir + golang.org/x/text/collate/colltab.a - filelist << l.gsub(buildroot + contribdir + "/",'').strip! if ( l.index(/\.a\n/) && ! l.gsub(importpath,'').index(/example|test/) ) + filelist << l.gsub(prefix,'').strip! if ( l.index(".a\n") && ! l.gsub(prefix + importpath,'').index(/example|test/) ) end # filelist:
