Hello community, here is the log from the commit of package yast2-devtools for openSUSE:Factory checked in at 2015-01-08 23:05:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-devtools (Old) and /work/SRC/openSUSE:Factory/.yast2-devtools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-devtools" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-devtools/yast2-devtools.changes 2014-11-24 11:11:15.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-devtools.new/yast2-devtools.changes 2015-01-08 23:05:38.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Jan 8 10:22:24 UTC 2015 - [email protected] + +- Add shared rubocop yast style config +- 3.1.27 + +------------------------------------------------------------------- Old: ---- yast2-devtools-3.1.26.tar.bz2 New: ---- yast2-devtools-3.1.27.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-devtools.spec ++++++ --- /var/tmp/diff_new_pack.PKUY7I/_old 2015-01-08 23:05:39.000000000 +0100 +++ /var/tmp/diff_new_pack.PKUY7I/_new 2015-01-08 23:05:39.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-devtools # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: yast2-devtools -Version: 3.1.26 +Version: 3.1.27 Release: 0 Url: http://github.com/yast/yast-devtools @@ -144,6 +144,7 @@ %{_datadir}/YaST2/data/devtools/bin/y2makepot %{_datadir}/YaST2/data/devtools/bin/gettextdomains %{_datadir}/YaST2/data/devtools/bin/ycp_puttext +%{_datadir}/YaST2/data/devtools/data/rubocop_yast_style.yml %dir %{_datadir}/YaST2/control/ %{_datadir}/YaST2/control/control_to_glade.xsl @@ -164,7 +165,8 @@ %endif # needed for doxygen, not nice %{_datadir}/YaST2/data/devtools/footer-notimestamp.html -%{_datadir}/YaST2/data/devtools/data +%dir %{_datadir}/YaST2/data/devtools/data +%{_datadir}/YaST2/data/devtools/data/YaST2.dict.txt %{_datadir}/YaST2/data/devtools/bin/y2autoconf %{_datadir}/YaST2/data/devtools/bin/y2automake ++++++ yast2-devtools-3.1.26.tar.bz2 -> yast2-devtools-3.1.27.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.26/package/yast2-devtools.changes new/yast2-devtools-3.1.27/package/yast2-devtools.changes --- old/yast2-devtools-3.1.26/package/yast2-devtools.changes 2014-11-14 11:18:12.000000000 +0100 +++ new/yast2-devtools-3.1.27/package/yast2-devtools.changes 2015-01-08 15:28:10.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jan 8 10:22:24 UTC 2015 - [email protected] + +- Add shared rubocop yast style config +- 3.1.27 + +------------------------------------------------------------------- Thu Nov 13 11:46:32 UTC 2014 - [email protected] - fix building with new libtool which use variable in backticks diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.26/package/yast2-devtools.spec new/yast2-devtools-3.1.27/package/yast2-devtools.spec --- old/yast2-devtools-3.1.26/package/yast2-devtools.spec 2014-11-14 11:18:12.000000000 +0100 +++ new/yast2-devtools-3.1.27/package/yast2-devtools.spec 2015-01-08 15:28:10.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-devtools -Version: 3.1.26 +Version: 3.1.27 Release: 0 Url: http://github.com/yast/yast-devtools @@ -144,6 +144,7 @@ %{_datadir}/YaST2/data/devtools/bin/y2makepot %{_datadir}/YaST2/data/devtools/bin/gettextdomains %{_datadir}/YaST2/data/devtools/bin/ycp_puttext +%{_datadir}/YaST2/data/devtools/data/rubocop_yast_style.yml %dir %{_datadir}/YaST2/control/ %{_datadir}/YaST2/control/control_to_glade.xsl @@ -165,7 +166,8 @@ %endif # needed for doxygen, not nice %{_datadir}/YaST2/data/devtools/footer-notimestamp.html -%{_datadir}/YaST2/data/devtools/data +%dir %{_datadir}/YaST2/data/devtools/data +%{_datadir}/YaST2/data/devtools/data/YaST2.dict.txt %{_datadir}/YaST2/data/devtools/bin/y2autoconf %{_datadir}/YaST2/data/devtools/bin/y2automake diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.26/travis-tools/travis_setup.sh new/yast2-devtools-3.1.27/travis-tools/travis_setup.sh --- old/yast2-devtools-3.1.26/travis-tools/travis_setup.sh 2014-11-14 11:18:12.000000000 +0100 +++ new/yast2-devtools-3.1.27/travis-tools/travis_setup.sh 2015-01-08 15:28:10.000000000 +0100 @@ -18,9 +18,26 @@ # The standard Ubuntu repos in /etc/apt/sources.list are kept. sudo rm /etc/apt/sources.list.d/* +# BASE URL on OBS project, so it works with same script for all supported branches. +OBS_PROJECT=$(sed -n '/obs_project =/s/^.*\"\(.*\)\".*$/\1/p' Rakefile) +case $OBS_PROJECT in + # SLE-12 + Devel:YaST:SLE-12) + REPO_URL="http://download.opensuse.org/repositories/YaST:/SLE-12:/GA:/Travis/xUbuntu_12.04/"; + ;; + # OpenSUSE 13.2 + YaST:openSUSE:13.2) + REPO_URL="http://download.opensuse.org/repositories/YaST:/openSUSE:/13.2:/Travis/xUbuntu_12.04"; + ;; + # master + *) + REPO_URL="http://download.opensuse.org/repositories/YaST:/Head:/Travis/xUbuntu_12.04"; + ;; +esac + # prepare the system for installing additional packages from OBS -curl http://download.opensuse.org/repositories/YaST:/Head:/Travis/xUbuntu_12.04/Release.key | sudo apt-key add - -echo "deb http://download.opensuse.org/repositories/YaST:/Head:/Travis/xUbuntu_12.04/ ./" | sudo tee -a /etc/apt/sources.list +curl $REPO_URL/Release.key | sudo apt-key add - +echo "deb $REPO_URL/ ./" | sudo tee -a /etc/apt/sources.list sudo apt-get update -q diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.26/ytools/y2tool/Makefile.am new/yast2-devtools-3.1.27/ytools/y2tool/Makefile.am --- old/yast2-devtools-3.1.26/ytools/y2tool/Makefile.am 2014-11-14 11:18:12.000000000 +0100 +++ new/yast2-devtools-3.1.27/ytools/y2tool/Makefile.am 2015-01-08 15:28:10.000000000 +0100 @@ -14,4 +14,8 @@ showy2log \ tagversion -EXTRA_DIST = $(pkgdata_SCRIPTS) +confdatadir = @YAST2DEVTOOLS@/data +confdata_DATA = \ + rubocop_yast_style.yml + +EXTRA_DIST = $(pkgdata_SCRIPTS) $(confdata_DATA) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.26/ytools/y2tool/rubocop_yast_style.yml new/yast2-devtools-3.1.27/ytools/y2tool/rubocop_yast_style.yml --- old/yast2-devtools-3.1.26/ytools/y2tool/rubocop_yast_style.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-devtools-3.1.27/ytools/y2tool/rubocop_yast_style.yml 2015-01-08 15:28:10.000000000 +0100 @@ -0,0 +1,49 @@ +# Rubocop style configuration +# +# Following +# https://github.com/SUSE/style-guides/blob/master/Ruby.md + +# https://github.com/SUSE/style-guides/blob/master/Ruby.md#strings +Style/StringLiterals: + EnforcedStyle: double_quotes + +Style/StringLiteralsInInterpolation: + EnforcedStyle: double_quotes + +# Is there any justification for "aligned" which is the default? +Style/MultilineOperationIndentation: + EnforcedStyle: indented + +# https://github.com/SUSE/style-guides/blob/master/Ruby.md#arrays +Style/WordArray: + Enabled: false + +# align arrows: +# "foo" => true +# "foo_bar" => false +# and also colons: +# foo: true +# foo_bar: false +Style/AlignHash: + EnforcedHashRocketStyle: table + EnforcedColonStyle: table + +# no extra indentation for multiline function calls +Style/AlignParameters: + EnforcedStyle: with_fixed_indentation + +# no extra indentation for case +Style/CaseIndentation: + IndentWhenRelativeTo: end + +# "unless" has a different connotation than "if not" +Style/NegatedIf: + Enabled: false + +# use "raise" instead of "fail" +Style/SignalException: + EnforcedStyle: only_raise + +# do not force %r +Style/RegexpLiteral: + Enabled: false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.26/ytools/yast2/checkall_buildrequires new/yast2-devtools-3.1.27/ytools/yast2/checkall_buildrequires --- old/yast2-devtools-3.1.26/ytools/yast2/checkall_buildrequires 2014-11-14 11:18:12.000000000 +0100 +++ new/yast2-devtools-3.1.27/ytools/yast2/checkall_buildrequires 2015-01-08 15:28:10.000000000 +0100 @@ -8,6 +8,7 @@ if [ -z "$MISSING" ]; then echo "All required packages are installed" else - echo -e "MISSING PACKAGES\n" >&2 + echo "MISSING PACKAGES" >&2 + echo >&2 echo "$MISSING" -fi \ No newline at end of file +fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.26/ytools/yast2/create_maintenance_branch new/yast2-devtools-3.1.27/ytools/yast2/create_maintenance_branch --- old/yast2-devtools-3.1.26/ytools/yast2/create_maintenance_branch 2014-11-14 11:18:12.000000000 +0100 +++ new/yast2-devtools-3.1.27/ytools/yast2/create_maintenance_branch 2015-01-08 15:28:10.000000000 +0100 @@ -1,15 +1,19 @@ #!/usr/bin/env ruby +# optional argument for source commit, if not specified use master +# create_maintenance.rb # creates branch for master +# create_maintenance.rb abcdef # creates branch from commit abcdef + # - Create maintenance branch BRANCH_NAME # - Edit Rakefile to build and submit to corresponding projects # - Commit and push # constants for tuning script to create desired branch -BRANCH_NAME="SLE-12-GA" -USE_IBS=true -DEVEL_PROJECT="Devel:YaST:SLE-12" -TARGET_PROJECT="SUSE:SLE-12:Update:Test" -BUILD_TARGET="SLE_12" +BRANCH_NAME="openSUSE-13_2" +USE_IBS=false +DEVEL_PROJECT="YaST:openSUSE:13.2" +TARGET_PROJECT="openSUSE:13.2:Update" +BUILD_TARGET="openSUSE_13.2" # start of non-configuration part CONF_OPTIONS = { @@ -56,7 +60,7 @@ config_line = lines.grep(/#{conf_var}\.#{key}\s*=/).first new_line = " #{conf_var}.#{key} = #{value.inspect}\n" if config_line - lines[lines.index[config_line]] = new_line + lines[lines.index(config_line)] = new_line else lines.insert(line_index + 1, new_line) end @@ -72,12 +76,15 @@ exit 0 end +# allow to branch from non master +source_commit = ARGV.empty? ? "origin/master" : ARGV.first + #switch to master branch Cheetah.run "git", "checkout", "master" #create new branch ( ensure we use the latest non modified pushed version ) Cheetah.run "git", "fetch", "origin" -Cheetah.run "git", "branch", BRANCH_NAME, "origin/master" +Cheetah.run "git", "branch", BRANCH_NAME, source_commit Cheetah.run "git", "checkout", BRANCH_NAME modify_rakefile @@ -86,6 +93,6 @@ Cheetah.run "git", "commit", "-m", commit_msg, "Rakefile" -Cheetah.run "git", "push", "--set-upstream", "origin", BRANCH_NAME +Cheetah.run "git", "push", "--set-upstream", "origin", "#{BRANCH_NAME}:#{BRANCH_NAME}" puts "Maintenance branch properly created" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
