Hello community, here is the log from the commit of package yast2-add-on for openSUSE:Factory checked in at 2017-04-12 17:10:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-add-on (Old) and /work/SRC/openSUSE:Factory/.yast2-add-on.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-add-on" Wed Apr 12 17:10:02 2017 rev:80 rq:486456 version:3.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-add-on/yast2-add-on.changes 2016-08-18 10:19:19.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-add-on.new/yast2-add-on.changes 2017-04-12 17:10:03.723532558 +0200 @@ -1,0 +2,8 @@ +Mon Apr 3 11:20:57 UTC 2017 - [email protected] + +- AutoYaST: Expanding URL in order to handle tags like $releasever. + (bnc#972046) +- 3.2.0 + +------------------------------------------------------------------- + Old: ---- yast2-add-on-3.1.17.tar.bz2 New: ---- yast2-add-on-3.2.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-add-on.spec ++++++ --- /var/tmp/diff_new_pack.XmfOg5/_old 2017-04-12 17:10:04.619405738 +0200 +++ /var/tmp/diff_new_pack.XmfOg5/_new 2017-04-12 17:10:04.623405172 +0200 @@ -1,7 +1,7 @@ # # spec file for package yast2-add-on # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -17,7 +17,7 @@ Name: yast2-add-on -Version: 3.1.17 +Version: 3.2.0 Release: 0 Summary: YaST2 - Add-On media installation code License: GPL-2.0 ++++++ yast2-add-on-3.1.17.tar.bz2 -> yast2-add-on-3.2.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-3.1.17/.travis.yml new/yast2-add-on-3.2.0/.travis.yml --- old/yast2-add-on-3.1.17/.travis.yml 2016-08-11 16:04:44.763781080 +0200 +++ new/yast2-add-on-3.2.0/.travis.yml 2017-04-07 16:41:04.166642099 +0200 @@ -1,13 +1,11 @@ -language: cpp +sudo: required +language: bash +services: + - docker + before_install: - # disable rvm, use system Ruby - - rvm reset - - wget https://raw.githubusercontent.com/yast/yast-devtools/master/travis-tools/travis_setup.sh - - sh ./travis_setup.sh -p "ruby2.1 rake yast2-devtools" -g "yast-rake yard gettext" + - docker build -t yast-add-on-image . script: - - rake check:syntax - - rake check:pot - - yardoc - - rake test:unit - - sudo rake install - + # the "yast-travis-ruby" script is included in the base yastdevel/ruby image + # see https://github.com/yast/docker-yast-ruby/blob/master/yast-travis-ruby + - docker run -it -e TRAVIS=1 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" yast-add-on-image yast-travis-ruby diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-3.1.17/CONTRIBUTING.md new/yast2-add-on-3.2.0/CONTRIBUTING.md --- old/yast2-add-on-3.1.17/CONTRIBUTING.md 2016-08-11 16:04:44.775781080 +0200 +++ new/yast2-add-on-3.2.0/CONTRIBUTING.md 2017-04-07 16:41:04.182642099 +0200 @@ -3,7 +3,7 @@ YaST is an open source project and as such it welcomes all kinds of contributions. If you decide to contribute, please follow these guidelines to -ensure the process is effective and pleasant both for you and YaST maintainers. +ensure the process is effective and pleasant both for you and the YaST maintainers. There are two main forms of contribution: reporting bugs and performing code changes. @@ -17,13 +17,11 @@ registration](https://secure-www.novell.com/selfreg/jsp/createSimpleAccount.jsp) if you don't have an account yet.) -If you find a problem, please report it either using -[Bugzilla](https://bugzilla.suse.com/) or GitHub issues. We can't guarantee -that every bug will be fixed, but we'll try. - When creating a bug report, please follow our [bug reporting guidelines](http://en.opensuse.org/openSUSE:Report_a_YaST_bug). +We can't guarantee that every bug will be fixed, but we'll try. + Code Changes ------------ @@ -44,15 +42,22 @@ to the [Ruby style guide](https://github.com/SUSE/style-guides/blob/master/Ruby.md). - 4. Make sure your change didn't break anything by building the RPM package + 4. Update the package version (in `packages/*.spec`, usually by + `rake version:bump`) and add a new entry to the `package/*.changes` file + (by `osc vc package`). + For bigger changes or changes which need longer discussion it is advised to + add this as a separate last commit so it can be easily updated when another + change is merged in the meantime. + + 5. Make sure your change didn't break anything by building the RPM package (`rake osc:build`). The build process includes running the full testsuite. - 5. Publish the branch and create a pull request. + 6. Publish the branch and create a pull request. - 6. YaST developers will review your change and possibly point out issues. + 7. YaST developers will review your change and possibly point out issues. Adapt the code under their guidance until they are all resolved. - 7. Finally, the pull request will get merged or rejected. + 8. Finally, the pull request will get merged or rejected. See also [GitHub's guide on contributing](https://help.github.com/articles/fork-a-repo). @@ -60,9 +65,6 @@ If you want to do multiple unrelated changes, use separate branches and pull requests. -Do not change the `VERSION` and `*.changes` files as this could lead to -conflicts. - ### Commits Each commit in the pull request should do only one thing, which is clearly diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-3.1.17/Dockerfile new/yast2-add-on-3.2.0/Dockerfile --- old/yast2-add-on-3.1.17/Dockerfile 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-add-on-3.2.0/Dockerfile 2017-04-07 16:41:04.198642099 +0200 @@ -0,0 +1,3 @@ +FROM yastdevel/ruby +COPY . /usr/src/app + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-3.1.17/package/yast2-add-on.changes new/yast2-add-on-3.2.0/package/yast2-add-on.changes --- old/yast2-add-on-3.1.17/package/yast2-add-on.changes 2016-08-11 16:04:44.819781080 +0200 +++ new/yast2-add-on-3.2.0/package/yast2-add-on.changes 2017-04-07 16:41:04.214642099 +0200 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Mon Apr 3 11:20:57 UTC 2017 - [email protected] + +- AutoYaST: Expanding URL in order to handle tags like $releasever. + (bnc#972046) +- 3.2.0 + +------------------------------------------------------------------- + Thu Aug 11 15:59:06 CEST 2016 - [email protected] - Added "confirm_license" to the RNC file. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-3.1.17/package/yast2-add-on.spec new/yast2-add-on-3.2.0/package/yast2-add-on.spec --- old/yast2-add-on-3.1.17/package/yast2-add-on.spec 2016-08-11 16:04:44.819781080 +0200 +++ new/yast2-add-on-3.2.0/package/yast2-add-on.spec 2017-04-07 16:41:04.214642099 +0200 @@ -17,7 +17,7 @@ Name: yast2-add-on -Version: 3.1.17 +Version: 3.2.0 Release: 0 Summary: YaST2 - Add-On media installation code License: GPL-2.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-3.1.17/src/clients/add-on_auto.rb new/yast2-add-on-3.2.0/src/clients/add-on_auto.rb --- old/yast2-add-on-3.1.17/src/clients/add-on_auto.rb 2016-08-11 16:04:44.839781080 +0200 +++ new/yast2-add-on-3.2.0/src/clients/add-on_auto.rb 2017-04-07 16:41:04.238642099 +0200 @@ -172,7 +172,8 @@ srcid = -1 begin url = AddOnProduct.SetRepoUrlAlias( - media, + # Expanding URL in order to "translate" tags like $releasever + Pkg.ExpandedUrl(media), Ops.get_string(prod, "alias", ""), Ops.get_string(prod, "name", "") ) @@ -180,6 +181,10 @@ srcid = Pkg.SourceCreate(url, pth) if (srcid == -1 || srcid == nil) + # revert back to the unexpanded URL to have the original URL + # in the saved /etc/zypp/repos.d file + Pkg.SourceChangeUrl(srcid, media) + if Ops.get_boolean(prod, "ask_on_error", false) prod["ask_on_error"] = Popup.ContinueCancel( Builtins.sformat( @@ -234,7 +239,7 @@ Builtins.y2milestone("Preferred name: %1", name) # Or use the one returned by Pkg::RepositoryScan else - repos_at_url = Pkg.RepositoryScan(media) + repos_at_url = Pkg.RepositoryScan(Pkg.ExpandedUrl(media)) # [ ["Product Name", "Path" ] ] Builtins.foreach(repos_at_url) do |one_repo| if Ops.get(one_repo, 1, "") == pth
