Skip to content

Commit

Permalink
Revert the pkg_finish change
Browse files Browse the repository at this point in the history
  • Loading branch information
lslezak committed Feb 14, 2019
1 parent 686694e commit f8cc032
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 19 deletions.
11 changes: 0 additions & 11 deletions src/lib/packager/clients/pkg_finish.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@

require "installation/finish_client"
require "y2packager/repository"
require "y2packager/known_repositories"
require "packager/cfa/zypp_conf"

Yast.import "InstURL"
Expand Down Expand Up @@ -78,7 +77,6 @@ def write
Pkg.SourceLoad
remove_auto_added_sources
disable_local_repos
save_system_packages_repos

# save all repositories and finish target
Pkg.SourceSaveAll
Expand Down Expand Up @@ -201,15 +199,6 @@ def disable_local_repos
end
end

# save the known repositories to not offer again installing the driver packages
# (they should be already installed in the initial installation, if user deselected
# them they should not be offered again)
def save_system_packages_repos
known_repos = Y2Packager::KnownRepositories.new
known_repos.update
known_repos.write
end

# Remove the temporary repositories created by the installer for its own
# purposes
#
Expand Down
8 changes: 0 additions & 8 deletions test/pkg_finish_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@
allow(Yast::ProductFeatures).to receive(:GetBooleanFeature)
.with("software", "minimalistic_libzypp_config")
.and_return(minimalistic_libzypp_config)
allow_any_instance_of(Y2Packager::KnownRepositories).to receive(:update)
allow_any_instance_of(Y2Packager::KnownRepositories).to receive(:write)
end

describe "Info" do
Expand Down Expand Up @@ -73,12 +71,6 @@
expect(client.run).to be_nil
end

it "saves the known repositories to not preselect the drivers later again" do
expect_any_instance_of(Y2Packager::KnownRepositories).to receive(:update)
expect_any_instance_of(Y2Packager::KnownRepositories).to receive(:write)
client.run
end

it "copies failed_packages list under destination dir" do
stub_const("Yast::Pkg", double("pkg").as_null_object)
expect(File).to receive(:exist?).with(FAILED_PKGS_PATH)
Expand Down

0 comments on commit f8cc032

Please sign in to comment.