From f467584c8b43a2a3b2e607bb5dd4466fafd29878 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Mon, 17 Sep 2018 14:03:09 +0200 Subject: [PATCH] The classes have been renamed --- src/lib/installation/clients/inst_update_installer.rb | 4 ++-- src/lib/installation/update_repository.rb | 4 ++-- test/inst_update_installer_test.rb | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/lib/installation/clients/inst_update_installer.rb b/src/lib/installation/clients/inst_update_installer.rb index 92067fc34..f8db765e0 100644 --- a/src/lib/installation/clients/inst_update_installer.rb +++ b/src/lib/installation/clients/inst_update_installer.rb @@ -15,7 +15,7 @@ require "installation/updates_manager" require "installation/update_repositories_finder" -require "y2packager/selfupdate_addon_repo" +require "y2packager/self_update_addon_repo" require "uri" require "yaml" @@ -521,7 +521,7 @@ def process_location def copy_addon_packages log.info("Copying optional addon packages from the self update repositories...") updates_manager.repositories.each do |u| - ::Y2Packager::SelfupdateAddonRepo.copy_packages(u.repo_id) + ::Y2Packager::SelfUpdateAddonRepo.copy_packages(u.repo_id) end end end diff --git a/src/lib/installation/update_repository.rb b/src/lib/installation/update_repository.rb index 0c74ff7b6..c8722b229 100644 --- a/src/lib/installation/update_repository.rb +++ b/src/lib/installation/update_repository.rb @@ -18,7 +18,7 @@ require "packages/package_downloader" require "packages/package_extractor" -require "y2packager/selfupdate_addon_filter" +require "y2packager/self_update_addon_filter" Yast.import "Pkg" Yast.import "Progress" @@ -153,7 +153,7 @@ def packages @packages = candidates.select { |p| p["source"] == repo_id }.sort_by! { |a| a["name"] } log.info "Found #{@packages.size} packages: #{@packages}" # remove packages which are used as addons, these should not be applied to the inst-sys - addon_pkgs = Y2Packager::SelfupdateAddonFilter.packages(repo_id) + addon_pkgs = Y2Packager::SelfUpdateAddonFilter.packages(repo_id) @packages.reject! { |p| addon_pkgs.include?(p["name"]) } log.info "Using #{@packages.size} packages: #{@packages}" @packages diff --git a/test/inst_update_installer_test.rb b/test/inst_update_installer_test.rb index 0bb1b305a..2440539f8 100755 --- a/test/inst_update_installer_test.rb +++ b/test/inst_update_installer_test.rb @@ -45,7 +45,7 @@ allow(subject).to receive(:require).with("registration/url_helpers").and_raise(LoadError) stub_const("Registration::Storage::InstallationOptions", FakeInstallationOptions) stub_const("Registration::Storage::Config", FakeRegConfig) - allow(Y2Packager::SelfupdateAddonRepo).to receive(:copy_packages) + allow(Y2Packager::SelfUpdateAddonRepo).to receive(:copy_packages) # skip the libzypp initialization globally, enable in the specific tests allow(subject).to receive(:initialize_packager).and_return(true) @@ -118,7 +118,7 @@ allow(subject).to receive(:add_repository).and_return(true) allow(manager).to receive(:apply_all) allow(::FileUtils).to receive(:touch) - allow(Y2Packager::SelfupdateAddonRepo).to receive(:copy_packages) + allow(Y2Packager::SelfUpdateAddonRepo).to receive(:copy_packages) end it "creates update file and returns :restart_yast" do @@ -126,7 +126,7 @@ end it "copies the add-on packages from the self-update repository" do - expect(Y2Packager::SelfupdateAddonRepo).to receive(:copy_packages) + expect(Y2Packager::SelfUpdateAddonRepo).to receive(:copy_packages) .with(repo.repo_id) subject.main end