Adds dist-upgrade option

Author: DjDCH

updatewrapper/__init__.py

@@ -8,7 +8,7 @@
 from updatewrapper.flavor import get_flavor_wrapper
 
 
-def wrap(hosts, out_dir):
+def wrap(hosts, out_dir, dist_upgrade):
     print_banner()
 
     logfiles = []
@@ -21,7 +21,7 @@ def wrap(hosts, out_dir):
     print()
     for host in hosts:
         try:
-            wrapper = get_flavor_wrapper(host)
+            wrapper = get_flavor_wrapper(host, dist_upgrade)
 
             print_info('BEGIN host %s' % host.addr)
             host.ask_passwords()
@@ -61,17 +61,19 @@ def wrap(hosts, out_dir):
 
 
 def main():
-    # TODO: Add --dist-upgrade option
-    opts, args = getopt.getopt(sys.argv[1:], 'c:h:o', ['config=', 'host=', 'out-dir='])
+    opts, args = getopt.getopt(sys.argv[1:], 'c:h:o', ['config=', 'dist-upgrade', 'host=', 'out-dir='])
 
     config_file = get_config_file()
     hosts = []
     host = None
     out_dir = os.getcwd()
+    dist_upgrade = False
 
     for opt in opts:
         if opt[0] in ('-c', '--config'):
             config_file = opt[1]
+        elif opt[0] == '--dist-upgrade':
+            dist_upgrade = True
         elif opt[0] in ('-h', '--host'):
             addr = opt[1]
             host = Host(addr=addr)  # TODO: Should allow to input other parameters or search from config
@@ -83,7 +85,7 @@ def main():
     else:
         hosts = get_hosts(config_file)
 
-    wrap(hosts, out_dir)
+    wrap(hosts, out_dir, dist_upgrade)
 
 
 if __name__ == "__main__":

updatewrapper/flavor/__init__.py

@@ -2,21 +2,21 @@
 import importlib
 
 
-def get_flavor_wrapper(host):
+def get_flavor_wrapper(host, dist_upgrade):
     flavor = host.flavor if host.flavor in ['debian', 'redhat'] else None
 
     if flavor is None:
         raise ValueError('Invalid flavor')
 
     Wrapper = getattr(importlib.import_module('updatewrapper.flavor.' + flavor), flavor.capitalize())
 
-    return Wrapper(host)
+    return Wrapper(host, dist_upgrade=dist_upgrade)
 
 
 class FlavorBase:
     __metaclass__ = abc.ABCMeta
 
-    def __init__(self, host):
+    def __init__(self, host, **kwargs):
         self.host = host
 
     @abc.abstractmethod

updatewrapper/flavor/debian.py

@@ -4,14 +4,19 @@
 
 
 class Debian(FlavorBase):
+    def __init__(self, host, dist_upgrade=False, **kwargs):
+        self.command = 'dist-upgrade' if dist_upgrade else 'upgrade'
+
+        super().__init__(host)
+
     def update_cache(self):
         return self.host.run('DEBIAN_FRONTEND=noninteractive apt-get update')
 
     def check_update(self):
-        return self.host.run('DEBIAN_FRONTEND=noninteractive apt-get --show-upgraded --assume-no upgrade')
+        return self.host.run('DEBIAN_FRONTEND=noninteractive apt-get --show-upgraded --assume-no ' + self.command)
 
     def has_update(self, returncode, stdout, stderr):
         return to_bytes('The following packages will be upgraded') in stdout
 
     def perform_update(self):
-        return self.host.run('DEBIAN_FRONTEND=noninteractive apt-get --show-upgraded --assume-yes upgrade')
+        return self.host.run('DEBIAN_FRONTEND=noninteractive apt-get --show-upgraded --assume-yes ' + self.command)