ext/packaging/tasks/pe_ship.rake in puppet-2.7.21 vs ext/packaging/tasks/pe_ship.rake in puppet-2.7.22
- old
+ new
@@ -14,16 +14,15 @@
end
end
desc "Ship PE debs to #{@build.apt_host}"
task :ship_debs => "pl:fetch" do
- dist = @build.default_cow.split('-')[1]
- if empty_dir?("pkg/pe/deb/#{dist}")
- STDERR.puts "The 'pkg/pe/deb/#{dist}' directory has no packages. Did you run rake pe:deb?"
+ if empty_dir?("pkg/pe/deb")
+ STDERR.puts "The 'pkg/pe/deb' directory has no packages!"
exit 1
else
- target_path = ENV['APT_REPO'] ? ENV['APT_REPO'] : "#{@build.apt_repo_path}/#{@build.pe_version}/repos/incoming/unified/"
- rsync_to("pkg/pe/deb/#{dist}/", @build.apt_host, target_path)
+ target_path = ENV['APT_REPO'] ? ENV['APT_REPO'] : "#{@build.apt_repo_path}/#{@build.pe_version}/repos/incoming/disparate/"
+ rsync_to("pkg/pe/deb/", @build.apt_host, target_path)
if @build.team == 'release'
Rake::Task["pe:remote:freight"].invoke
end
end
end