From fd832239d3be2c6b15533aa60e5f1242067e0fac Mon Sep 17 00:00:00 2001
From: Daniel Narvaez <dwnarvaez@gmail.com>
Date: Sat, 17 Nov 2012 19:51:04 +0000
Subject: Don't use SUGAR_BUILDBOT in devbot

To keep it generic
---
(limited to 'devbot/distro.py')

diff --git a/devbot/distro.py b/devbot/distro.py
index 1a37bd5..1645b29 100644
--- a/devbot/distro.py
+++ b/devbot/distro.py
@@ -4,13 +4,14 @@ import subprocess
 from devbot import command
 
 class FedoraPackageManager:
-    def __init__(self, test=False):
+    def __init__(self, test=False, interactive=True):
         self._test = test
+        self._interactive = interactive
 
     def install_packages(self, packages):
         args = ["yum"]
 
-        if "SUGAR_BUILDBOT" in os.environ:
+        if not self._interactive:
             args.append("-y")
 
         args.append("install")
@@ -27,7 +28,7 @@ class FedoraPackageManager:
     def update(self):
         args = ["yum"]
 
-        if "SUGAR_BUILDBOT" in os.environ:
+        if self._interactive:
             args.append("-y")
 
         args.append("update")
@@ -77,10 +78,12 @@ class FedoraPackageManager:
                     self._find_deps(dep_package, result)
 
 class UbuntuPackageManager:
-    def __init__(self, test=False):
+    def __init__(self, test=False, interactive=True):
         import apt
 
         self._test = test
+        self._interactive = interactive
+
         self._cache = apt.cache.Cache()
 
     def install_packages(self, packages):
@@ -136,13 +139,13 @@ class UbuntuPackageManager:
 
         return result
 
-def get_package_manager(test=False):
+def get_package_manager(test=False, interactive=True):
     name, version = _get_distro_info()
 
     if name == "fedora":
-        return FedoraPackageManager(test=test)
+        return FedoraPackageManager(test=test, interactive=True)
     elif name == "ubuntu":
-        return UbuntuPackageManager(test=test)
+        return UbuntuPackageManager(test=test, interactive=True)
 
 def get_system_version():
     name, version = _get_distro_info()
--
cgit v0.9.1