[Vmdebootstrap-devel] [REJECT] indentation problem preventing --no-kernel functionality

[Jonathan Rajotte Julien]

On 2016-02-23 06:52 AM, Neil Williams wrote:
> On Mon, 22 Feb 2016 19:26:13 -0500
> Jonathan Rajotte <jonathan.rajotte-julien at efficios.com> wrote:
>
>> Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien at efficios.com>
>> ---
>>   vmdebootstrap/codenames.py | 20 ++++++++++----------
>>   1 file changed, 10 insertions(+), 10 deletions(-)
> Fails to apply.
>
>> 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
> This is not the same as HEAD:
> https://sources.debian.net/src/vmdebootstrap/1.4-1/vmdebootstrap/codenames.py/#L63
Sorry my fault. Looks like I had an old head. Seems like yesterday was a 
long day.

Works fine with HEAD as you said.

BTW vmdeboostrap works quite well thanks !

Cheers

> AFAICT there is no problem with --no-kernel functionality in 1.4.
>
>> -        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
>>
>>
>> _______________________________________________
>> Vmdebootstrap-devel mailing list
>> Vmdebootstrap-devel at lists.alioth.debian.org
>> https://lists.alioth.debian.org/mailman/listinfo/vmdebootstrap-devel
>

-- 
Jonathan R. Julien
Efficios