[Vmdebootstrap-devel] [PATCH] Fix: indentation problem preventing --no-kernel functionality

Jonathan Rajotte jonathan.rajotte-julien at efficios.com
Tue Feb 23 00:26:13 UTC 2016


Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien at efficios.com>
---
 vmdebootstrap/codenames.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/vmdebootstrap/codenames.py b/vmdebootstrap/codenames.py
index d0f71fe..f2f052b 100644
--- a/vmdebootstrap/codenames.py
+++ b/vmdebootstrap/codenames.py
@@ -65,15 +65,15 @@ class Codenames(Base):
         if not self.settings['no-kernel']:
             if self.settings['kernel-package']:
                 return packages
-        if self.settings['arch'] == 'i386':
-            # wheezy (which became oldstable on 04/25/2015) used '486'
-            if self.was_oldstable(datetime.date(2015, 4, 26)):
-                kernel_arch = '486'
+            if self.settings['arch'] == 'i386':
+                # wheezy (which became oldstable on 04/25/2015) used '486'
+                if self.was_oldstable(datetime.date(2015, 4, 26)):
+                    kernel_arch = '486'
+                else:
+                    kernel_arch = '586'
+            elif self.settings['arch'] == 'armhf':
+                kernel_arch = 'armmp'
             else:
-                kernel_arch = '586'
-        elif self.settings['arch'] == 'armhf':
-            kernel_arch = 'armmp'
-        else:
-            kernel_arch = self.settings['arch']
-        packages.append('linux-image-%s' % kernel_arch)
+                kernel_arch = self.settings['arch']
+            packages.append('linux-image-%s' % kernel_arch)
         return packages
-- 
2.5.0




More information about the Vmdebootstrap-devel mailing list