Skip to content

Commit

Permalink
Fix printing package manager name in --show-resource=system
Browse files Browse the repository at this point in the history
Now when we use PackageManger adapter, we can't just print
its name, but names of all managers that it use
  • Loading branch information
FrostyX committed Feb 19, 2015
1 parent 64dffb1 commit 66675c3
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
4 changes: 2 additions & 2 deletions tracer/controllers/resource.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,11 @@ def render_system(self):

users = set([user.name for user in psutil.get_users()])
user = os.getlogin()
package_manager = System.package_manager().__class__.__name__
package_managers = System.package_manager().names()

view = SystemView()
view.assign('distribution', System.distribution())
view.assign('package_manager', package_manager)
view.assign('package_managers', package_managers)
view.assign('init', System.init_system())
view.assign('uptime', uptime)
view.assign('user', user)
Expand Down
3 changes: 3 additions & 0 deletions tracer/resources/PackageManager.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ class PackageManager:
def __init__(self, *instances):
self.package_managers = instances

def names(self):
return map(lambda x: x.__class__.__name__ ,self.package_managers)

def packages_newer_than(self, unix_time):
"""
Returns list of packages which were modified between unix_time and present
Expand Down
2 changes: 1 addition & 1 deletion tracer/views/resource/system.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ class SystemView(View):
def render(self):
line = "{0:<20}{1}"
print line.format("Distribution:", self.args.distribution)
print line.format("Package Manager:", self.args.package_manager)
print line.format("Package Manager:", ", ".join(self.args.package_managers))
print line.format("Init system:", self.args.init)
print line.format("Uptime:", self.args.uptime)
print line.format("User:", self.args.user)
Expand Down

0 comments on commit 66675c3

Please sign in to comment.