Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

apt now uses module function to find bin paths #2932

Merged
merged 1 commit into from
May 18, 2013
Merged

apt now uses module function to find bin paths #2932

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions library/packaging/apt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,6 @@ import os
import datetime

# APT related constants
APTITUDE_CMD = "aptitude"
APT_GET_CMD = "apt-get"
APT_ENVVARS = "DEBIAN_FRONTEND=noninteractive DEBIAN_PRIORITY=critical"
DPKG_OPTIONS = '-o "Dpkg::Options::=--force-confdef" -o "Dpkg::Options::=--force-confold"'
APT_GET_ZERO = "0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded."
Expand Down Expand Up @@ -265,6 +263,9 @@ def main():
except:
module.fail_json(msg="Could not import python modules: apt, apt_pkg. Please install python-apt package.")

global APTITUDE_CMD = module.get_bin_path("aptitude", False)
global APT_GET_CMD = module.get_bin_path("apt-get")

p = module.params
install_recommends = p['install_recommends']

Expand Down