lib/right_publish/repos/apt.rb in right_publish-0.2.0 vs lib/right_publish/repos/apt.rb in right_publish-0.2.1
- old
+ new
@@ -6,16 +6,16 @@
DEFAULT_APT_DIR = 'apt/'
DEFAULT_DESCRIPTION = "RightScale RightLink Repository"
REPO_KEY = :apt_repo
REPO_OPTIONS = {
- :dists=>:addr_optional,
+ :dists => :addr_optional,
:description => DEFAULT_DESCRIPTION,
- :auto=>DEFAULT_APT_AUTO,
- :subdir=>DEFAULT_APT_DIR,
- :gpg_key_id => :attr_optional,
- :gpg_password => :attr_optional }
+ :auto => DEFAULT_APT_AUTO,
+ :subdir => DEFAULT_APT_DIR,
+ :gpg_key_id => :attr_optional,
+ :gpg_password => :attr_optional }
BIN_EXTENSION = 'deb'
SRC_EXTENSION = 'dsc'
BIN_ALL_ARCH = 'all'
@@ -85,11 +85,11 @@
def auto_repo_add(repo_path, pkg, target)
targets = (target && Array(target)) || repo_config[:dists]
targets.each do |t|
sub_command = (pkg.end_with?(BIN_EXTENSION) && 'includedeb') || 'includedsc'
ask_passphrase = (repo_config[:gpg_key_id]) ? "--ask-passphrase " : ""
- cmd = "reprepro #{ask_passphrase}-C main -b #{repo_path} #{sub_command} #{t} #{pkg} 2>&1 >/dev/null"
+ cmd = "reprepro #{ask_passphrase}-C main -b #{repo_path} #{sub_command} #{t} #{pkg}"
if repo_config[:gpg_key_id]
exited = shellout_with_password(cmd)
else
exited = system(cmd)
end
@@ -104,10 +104,10 @@
Profile.log("Removing any existing files for #{pkg_name}")
targets = (target && Array(target)) || repo_config[:dists]
targets.each do |t|
ask_passphrase = (repo_config[:gpg_key_id]) ? "--ask-passphrase" : ""
- cmd = "reprepro #{ask_passphrase} -b #{repo_path} #{sub_command} #{t} #{pkg_name} 2>&1 >/dev/null"
+ cmd = "reprepro #{ask_passphrase} -b #{repo_path} #{sub_command} #{t} #{pkg_name}"
if repo_config[:gpg_key_id]
exited = shellout_with_password(cmd)
else
exited = system(cmd)
end