Hello community, here is the log from the commit of package yast2-users for openSUSE:Factory checked in at 2020-12-05 20:36:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-users (Old) and /work/SRC/openSUSE:Factory/.yast2-users.new.5913 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-users" Sat Dec 5 20:36:20 2020 rev:239 rq:853121 version:4.3.10 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-users/yast2-users.changes 2020-11-13 18:57:15.257991104 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-users.new.5913/yast2-users.changes 2020-12-05 20:37:12.638710491 +0100 @@ -1,0 +2,7 @@ +Wed Dec 2 10:41:55 UTC 2020 - Imobach Gonzalez Sosa <igonzalezs...@suse.com> + +- In the public key selector, allow to choose any device that + contains any filesystem except swap and squashfs (bsc#1178509). +- 4.3.10 + +------------------------------------------------------------------- Old: ---- yast2-users-4.3.9.tar.bz2 New: ---- yast2-users-4.3.10.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-users.spec ++++++ --- /var/tmp/diff_new_pack.Zau5Ur/_old 2020-12-05 20:37:13.118710979 +0100 +++ /var/tmp/diff_new_pack.Zau5Ur/_new 2020-12-05 20:37:13.122710983 +0100 @@ -17,7 +17,7 @@ Name: yast2-users -Version: 4.3.9 +Version: 4.3.10 Release: 0 Summary: YaST2 - User and Group Configuration License: GPL-2.0-only ++++++ yast2-users-4.3.9.tar.bz2 -> yast2-users-4.3.10.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-4.3.9/.github/workflows/ci.yml new/yast2-users-4.3.10/.github/workflows/ci.yml --- old/yast2-users-4.3.9/.github/workflows/ci.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-users-4.3.10/.github/workflows/ci.yml 2020-12-04 15:04:34.000000000 +0100 @@ -0,0 +1,96 @@ +# See https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions + +name: CI + +on: [push, pull_request] + +jobs: + Tests: + runs-on: ubuntu-latest + container: registry.opensuse.org/yast/head/containers/yast-ruby:latest + + steps: + + - name: Git Checkout + uses: actions/checkout@v2 + + # just for easier debugging... + - name: Inspect Installed Packages + run: rpm -qa | sort + + - name: Unit Tests + run: rake test:unit + # enable code coverage reporting + env: + COVERAGE: 1 + + # send the coverage report to coveralls.io + - name: Coveralls Report + uses: coverallsapp/github-action@master + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + + Rubocop: + runs-on: ubuntu-latest + container: registry.opensuse.org/yast/head/containers/yast-cpp:latest + + steps: + + - name: Git Checkout + uses: actions/checkout@v2 + + - name: Rubocop + run: rake check:rubocop + + Package: + runs-on: ubuntu-latest + container: registry.opensuse.org/yast/head/containers/yast-cpp:latest + + steps: + + - name: Git Checkout + uses: actions/checkout@v2 + + - name: Prepare System + run: | + # build_dependencies:install is not enough as some perl deps are runtime only + rake build_dependencies:install + zypper --non-interactive in --force-resolution --no-recommends \ + cracklib-devel \ + perl-Digest-SHA1 \ + perl-X500-DN \ + yast2-perl-bindings + + - name: Package Build + run: yast-ci-cpp + env: + # the tests require specific locale settings to pass + LANG: POSIX + LC_ALL: "" + # for the Perl syntax check + PERL5LIB: "./agents-perl/lib" + + Yardoc: + runs-on: ubuntu-latest + container: registry.opensuse.org/yast/head/containers/yast-ruby:latest + + steps: + + - name: Git Checkout + uses: actions/checkout@v2 + + - name: Yardoc + run: rake check:doc + + Checks: + runs-on: ubuntu-latest + container: registry.opensuse.org/yast/head/containers/yast-ruby:latest + + steps: + + - name: Git Checkout + uses: actions/checkout@v2 + + - name: POT Check + run: rake check:pot + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-4.3.9/.travis.yml new/yast2-users-4.3.10/.travis.yml --- old/yast2-users-4.3.9/.travis.yml 2020-11-11 14:32:00.000000000 +0100 +++ new/yast2-users-4.3.10/.travis.yml 1970-01-01 01:00:00.000000000 +0100 @@ -1,16 +0,0 @@ -sudo: required -language: bash -services: - - docker - -before_install: - - docker build -t yast-users-image . - # list the installed packages (just for easier debugging) - - docker run --rm -it yast-users-image rpm -qa | sort - -script: - # the "yast-travis-cpp" script is included in the base yastdevel/cpp image - # see https://github.com/yast/docker-yast-ruby/blob/master/yast-travis-cpp - - docker run -it --privileged -e TRAVIS=1 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" yast-users-image yast-travis-cpp - - docker run -it --privileged -e TRAVIS=1 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" -e COVERAGE=1 -e CI=1 yast-users-image rake test:unit - - docker run -it --privileged -e TRAVIS=1 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" -e COVERAGE=1 -e CI=1 yast-users-image rake check:doc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-4.3.9/Dockerfile new/yast2-users-4.3.10/Dockerfile --- old/yast2-users-4.3.9/Dockerfile 2020-11-11 14:32:00.000000000 +0100 +++ new/yast2-users-4.3.10/Dockerfile 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ -FROM registry.opensuse.org/yast/head/containers/yast-cpp:latest -RUN zypper --non-interactive in --force-resolution --no-recommends \ - cracklib-devel \ - perl-Digest-SHA1 \ - perl-X500-DN \ - yast2 \ - yast2-ldap \ - yast2-perl-bindings \ - yast2-security -COPY . /usr/src/app diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-4.3.9/README.md new/yast2-users-4.3.10/README.md --- old/yast2-users-4.3.9/README.md 2020-11-11 14:32:00.000000000 +0100 +++ new/yast2-users-4.3.10/README.md 2020-12-04 15:04:34.000000000 +0100 @@ -1,5 +1,6 @@ # YaST - The Users Management Module # -[](https://travis-ci.org/yast/yast-users) -[](https://ci.opensuse.org/view/Yast/job/yast-users-master/) - +[]( +https://github.com/yast/yast-users/actions?query=branch%3Amaster) +[]( +https://ci.opensuse.org/view/Yast/job/yast-yast-users-master/) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-4.3.9/package/yast2-users.changes new/yast2-users-4.3.10/package/yast2-users.changes --- old/yast2-users-4.3.9/package/yast2-users.changes 2020-11-11 14:32:00.000000000 +0100 +++ new/yast2-users-4.3.10/package/yast2-users.changes 2020-12-04 15:04:34.000000000 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Dec 2 10:41:55 UTC 2020 - Imobach Gonzalez Sosa <igonzalezs...@suse.com> + +- In the public key selector, allow to choose any device that + contains any filesystem except swap and squashfs (bsc#1178509). +- 4.3.10 + +------------------------------------------------------------------- Wed Nov 11 11:09:04 UTC 2020 - Stefan Schubert <sch...@suse.de> - Importing public SSH key in administrator screen: Disable diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-4.3.9/package/yast2-users.spec new/yast2-users-4.3.10/package/yast2-users.spec --- old/yast2-users-4.3.9/package/yast2-users.spec 2020-11-11 14:32:00.000000000 +0100 +++ new/yast2-users-4.3.10/package/yast2-users.spec 2020-12-04 15:04:34.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-users -Version: 4.3.9 +Version: 4.3.10 Release: 0 Summary: YaST2 - User and Group Configuration License: GPL-2.0-only diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-4.3.9/src/lib/users/leaf_blk_device.rb new/yast2-users-4.3.10/src/lib/users/leaf_blk_device.rb --- old/yast2-users-4.3.9/src/lib/users/leaf_blk_device.rb 2020-11-11 14:32:00.000000000 +0100 +++ new/yast2-users-4.3.10/src/lib/users/leaf_blk_device.rb 2020-12-04 15:04:34.000000000 +0100 @@ -49,7 +49,7 @@ parent = find_root_device(hash) new( name: hash["name"], disk: parent["name"], model: parent["model"], - transport: parent["tran"], fstype: hash["fstype"] + fstype: hash["fstype"] ) end @@ -61,7 +61,7 @@ def lsblk output = Yast::Execute.locally( "/usr/bin/lsblk", "--inverse", "--json", "--paths", - "--output", "NAME,TRAN,FSTYPE,MODEL", stdout: :capture + "--output", "NAME,FSTYPE,MODEL", stdout: :capture ) return { "blockdevices" => [] } if output.nil? JSON.parse(output) @@ -84,9 +84,6 @@ # @return [String] Disk's kernel name attr_reader :disk - # @return [Symbol] Disk's transport (:usb, :ata, etc.) - attr_reader :transport - # @return [Symbol] Filesystem type attr_reader :fstype @@ -95,13 +92,11 @@ # @param name [String] Kernel name # @param disk [String] Disk's kernel name # @param model [String] Hardware model - # @param transport [symbol] Transport # @param fstype [Symbol] Filesystem type - def initialize(name:, disk:, model:, transport: nil, fstype: nil) + def initialize(name:, disk:, model:, fstype: nil) @name = name - @model = model + @model = model.strip if model @disk = disk - @transport = transport.to_sym if transport @fstype = fstype.to_sym if fstype end @@ -111,12 +106,5 @@ def filesystem? !!fstype end - - # Determines whether the device has a transport - # - # @return [Boolean] - def transport? - !!transport - end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-4.3.9/src/lib/users/widgets/public_key_selector.rb new/yast2-users-4.3.10/src/lib/users/widgets/public_key_selector.rb --- old/yast2-users-4.3.9/src/lib/users/widgets/public_key_selector.rb 2020-11-11 14:32:00.000000000 +0100 +++ new/yast2-users-4.3.10/src/lib/users/widgets/public_key_selector.rb 2020-12-04 15:04:34.000000000 +0100 @@ -207,11 +207,13 @@ # @return [Yast::Term] def blk_devices_combo_box options = available_blk_devices.map do |dev| - Item(Id(dev.name), "#{dev.model} (#{dev.name})", dev.name == selected_blk_device_name) + label = dev.model ? "#{dev.model} (#{dev.name})" : dev.name + Item(Id(dev.name), label, dev.name == selected_blk_device_name) end ComboBox(Id(:blk_device), Opt(:hstretch), "", options) end + EXCLUDED_FSTYPES = [:squashfs, :swap].freeze # Returns a list of devices that can be selected # # Only the devices that meet the following conditions are considered: @@ -226,7 +228,7 @@ # @return [Array<LeafBlkDevice>] List of devices def available_blk_devices @available_blk_devices ||= LeafBlkDevice.all.select do |dev| - dev.filesystem? && dev.fstype != :squash && dev.transport? + dev.filesystem? && !EXCLUDED_FSTYPES.include?(dev.fstype) end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-4.3.9/test/fixtures/lsblk.txt new/yast2-users-4.3.10/test/fixtures/lsblk.txt --- old/yast2-users-4.3.9/test/fixtures/lsblk.txt 2020-11-11 14:32:00.000000000 +0100 +++ new/yast2-users-4.3.10/test/fixtures/lsblk.txt 2020-12-04 15:04:34.000000000 +0100 @@ -1,16 +1,17 @@ { "blockdevices": [ - {"name": "/dev/sda1", "tran": null, "fstype": "vfat", "rm": "0", "model": null, + {"name": "/dev/sda1", "fstype": "vfat", "model": null, "children": [ - {"name": "/dev/sda", "tran": "sata", "fstype": null, "rm": "0", "model": "WDC WD10EZEX-75M"} + {"name": "/dev/sda", "fstype": null, "model": "WDC WD10EZEX-75M"} ] }, - {"name": "/dev/sda2", "tran": null, "fstype": "ext4", "rm": "0", "model": null, + {"name": "/dev/sda2", "fstype": "ext4", "model": null, "children": [ - {"name": "/dev/sda", "tran": "sata", "fstype": null, "rm": "0", "model": "WDC WD10EZEX-75M"} + {"name": "/dev/sda", "fstype": null, "model": "WDC WD10EZEX-75M"} ] }, - {"name": "/dev/sr0", "tran": "sata", "fstype": null, "rm": "1", "model": "DVD-ROM DS-8DBSH"}, - {"name": "/dev/sr1", "tran": "usb", "fstype": "iso9660", "rm": "1", "model": "File-CD Gadget "} + {"name": "/dev/sr0", "fstype": null, "model": "DVD-ROM DS-8DBSH"}, + {"name": "/dev/sr1", "fstype": "iso9660", "model": "File-CD Gadget "}, + {"name": "/dev/loop0", "fstype": "squashfs", "model": null} ] } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-4.3.9/test/lib/users/leaf_blk_device_test.rb new/yast2-users-4.3.10/test/lib/users/leaf_blk_device_test.rb --- old/yast2-users-4.3.9/test/lib/users/leaf_blk_device_test.rb 2020-11-11 14:32:00.000000000 +0100 +++ new/yast2-users-4.3.10/test/lib/users/leaf_blk_device_test.rb 2020-12-04 15:04:34.000000000 +0100 @@ -36,7 +36,8 @@ an_object_having_attributes(name: "/dev/sda1", fstype: :vfat), an_object_having_attributes(name: "/dev/sda2", fstype: :ext4), an_object_having_attributes(name: "/dev/sr0", fstype: nil), - an_object_having_attributes(name: "/dev/sr1", fstype: :iso9660) + an_object_having_attributes(name: "/dev/sr1", fstype: :iso9660), + an_object_having_attributes(name: "/dev/loop0", fstype: :squashfs) ) end @@ -74,29 +75,4 @@ end end end - - describe "#transport?" do - subject do - Y2Users::LeafBlkDevice.new( - name: "/dev/sdb1", model: "MyBrand 8G", disk: "/dev/sdb", fstype: "ext4", - transport: transport - ) - end - - context "when the device has a transport" do - let(:transport) { "usb" } - - it "returns true" do - expect(subject.transport?).to eq(true) - end - end - - context "when the device does not have a transport" do - let(:transport) { nil } - - it "returns false" do - expect(subject.transport?).to eq(false) - end - end - end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-4.3.9/test/lib/users/widgets/public_key_selector_test.rb new/yast2-users-4.3.10/test/lib/users/widgets/public_key_selector_test.rb --- old/yast2-users-4.3.9/test/lib/users/widgets/public_key_selector_test.rb 2020-11-11 14:32:00.000000000 +0100 +++ new/yast2-users-4.3.10/test/lib/users/widgets/public_key_selector_test.rb 2020-12-04 15:04:34.000000000 +0100 @@ -39,33 +39,29 @@ end describe "#contents" do - let(:blk_devices) { [usb_with_fs, usb_no_fs, squashfs, no_transport] } + let(:blk_devices) { [usb_with_fs, usb_no_fs, squashfs, swap] } let(:usb_with_fs) do Y2Users::LeafBlkDevice.new( - name: "/dev/sdb1", model: "MyBrand 8G", disk: "/dev/sdb", transport: :usb, - fstype: :vfat + name: "/dev/sdb1", model: "MyBrand 8G", disk: "/dev/sdb", fstype: :vfat ) end let(:usb_no_fs) do Y2Users::LeafBlkDevice.new( - name: "/dev/sdc1", model: "MyBrand 4G", disk: "/dev/sdc", transport: :usb, - fstype: nil + name: "/dev/sdc1", model: "MyBrand 4G", disk: "/dev/sdc", fstype: nil ) end let(:squashfs) do Y2Users::LeafBlkDevice.new( - name: "/dev/some", model: "MyBrand 4G", disk: "/dev/sdc", transport: :unknown, - fstype: :squashfs + name: "/dev/loop0", model: "MyBrand 4G", disk: "/dev/loop0", fstype: :squashfs ) end - let(:no_transport) do + let(:swap) do Y2Users::LeafBlkDevice.new( - name: "/dev/loop1", model: "MyBrand 8G", disk: "/dev/sdb", transport: nil, - fstype: :unknown + name: "/dev/sda1", model: nil, disk: "/dev/sda", fstype: :swap ) end @@ -85,11 +81,11 @@ end it "does not include devices which has a squashfs filesystem" do - expect(widget.contents.to_s).to_not include("/dev/loop1") + expect(widget.contents.to_s).to_not include("/dev/loop0") end - it "does not include devices which does not have a transport" do - expect(widget.contents.to_s).to_not include("/dev/loop1") + it "does not include swap devices" do + expect(widget.contents.to_s).to_not include("/dev/sda1") end context "when a key is selected" do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-4.3.9/test/test_helper.rb new/yast2-users-4.3.10/test/test_helper.rb --- old/yast2-users-4.3.9/test/test_helper.rb 2020-11-11 14:32:00.000000000 +0100 +++ new/yast2-users-4.3.10/test/test_helper.rb 2020-12-04 15:04:34.000000000 +0100 @@ -37,12 +37,20 @@ # for coverage we need to load all ruby files Dir["#{src_path}/{modules,lib}/**/*.rb"].each { |f| require_relative f } - # use coveralls for on-line code coverage reporting at Travis CI - if ENV["TRAVIS"] - require "coveralls" + # additionally use the LCOV format for on-line code coverage reporting at CI + if ENV["CI"] || ENV["COVERAGE_LCOV"] + require "simplecov-lcov" + + SimpleCov::Formatter::LcovFormatter.config do |c| + c.report_with_single_file = true + # this is the default Coveralls GitHub Action location + # https://github.com/marketplace/actions/coveralls-github-action + c.single_report_path = "coverage/lcov.info" + end + SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[ SimpleCov::Formatter::HTMLFormatter, - Coveralls::SimpleCov::Formatter + SimpleCov::Formatter::LcovFormatter ] end end _______________________________________________ openSUSE Commits mailing list -- commit@lists.opensuse.org To unsubscribe, email commit-le...@lists.opensuse.org List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/commit@lists.opensuse.org
