Skip to content

Commit

Permalink
More pylint cleanups.
Browse files Browse the repository at this point in the history 
Signed-off-by: Chris Lalancette <[email protected]>
  • Loading branch information
@clalancette
clalancette committed Jun 20, 2018
1 parent 47274f2 commit 6bb10b5
Show file tree
Hide file tree
Showing 4 changed files with 68 additions and 71 deletions.
2 changes: 1 addition & 1 deletion oz-customize
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env python3

# Copyright (C) 2010,2011 Chris Lalancette <[email protected]>
# Copyright (C) 2012-2016 Chris Lalancette <[email protected]>
# Copyright (C) 2012-2018 Chris Lalancette <[email protected]>

# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
Expand Down
2 changes: 1 addition & 1 deletion oz-generate-icicle
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env python3

# Copyright (C) 2010,2011 Chris Lalancette <[email protected]>
# Copyright (C) 2012-2016 Chris Lalancette <[email protected]>
# Copyright (C) 2012-2018 Chris Lalancette <[email protected]>

# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
Expand Down
2 changes: 1 addition & 1 deletion oz/FedoraCore.py
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright (C) 2010,2011 Chris Lalancette <[email protected]>
# Copyright (C) 2012-2017 Chris Lalancette <[email protected]>
# Copyright (C) 2012-2018 Chris Lalancette <[email protected]>

# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
Expand Down
133 changes: 65 additions & 68 deletions oz/Mageia.py
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2013-2017 Chris Lalancette <[email protected]>
# Copyright (C) 2013-2018 Chris Lalancette <[email protected]>

# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
Expand Down Expand Up @@ -128,32 +128,30 @@ def _cfg_sub(line):

self.log.debug("Modifying isolinux.cfg")
if self.config.isolinux_style == "old":
'''
Mageia 2 dual - isolinux/32.cfg
isolinux/64.cfg
isolinux/alt0/32/vmlinuz
isolinux/alt0/32/all.rdz
isolinux/alt0/64/vmlinuz
isolinux/alt0/64/all.rdz
Mageia 2 x86_64 - x86_64/isolinux/isolinux.cfg
x86_64/isolinux/alt0/vmlinuz
x86_64/isolinux/alt0/all.rdz
Mageia 2 i586 - i586/isolinux/isolinux.cfg
i586/isolinux/vmlinuz
i586/isolinux/all.rdz
Mageia 3 dual - syslinux/32.cfg
syslinux/64.cfg
syslinux/alt0/32/vmlinuz
syslinux/alt0/32/all.rdz
syslinux/alt0/64/vmlinuz
syslinux/alt0/64/all.rdz
Mageia 3 x86_64 - x86_64/isolinux/isolinux.cfg
x86_64/isolinux/alt0/vmlinuz
x86_64/isolinux/alt0/all.rdz
Mageia 3 i586 - i586/isolinux/isolinux.cfg
i586/isolinux/alt0/vmlinuz
i586/isolinux/alt0/all.rdz
'''
# Mageia 2 dual - isolinux/32.cfg
# isolinux/64.cfg
# isolinux/alt0/32/vmlinuz
# isolinux/alt0/32/all.rdz
# isolinux/alt0/64/vmlinuz
# isolinux/alt0/64/all.rdz
# Mageia 2 x86_64 - x86_64/isolinux/isolinux.cfg
# x86_64/isolinux/alt0/vmlinuz
# x86_64/isolinux/alt0/all.rdz
# Mageia 2 i586 - i586/isolinux/isolinux.cfg
# i586/isolinux/vmlinuz
# i586/isolinux/all.rdz
# Mageia 3 dual - syslinux/32.cfg
# syslinux/64.cfg
# syslinux/alt0/32/vmlinuz
# syslinux/alt0/32/all.rdz
# syslinux/alt0/64/vmlinuz
# syslinux/alt0/64/all.rdz
# Mageia 3 x86_64 - x86_64/isolinux/isolinux.cfg
# x86_64/isolinux/alt0/vmlinuz
# x86_64/isolinux/alt0/all.rdz
# Mageia 3 i586 - i586/isolinux/isolinux.cfg
# i586/isolinux/alt0/vmlinuz
# i586/isolinux/alt0/all.rdz
isolinuxstr = None
if os.path.exists(os.path.join(self.iso_contents, 'isolinux')):
isolinuxstr = "isolinux"
Expand Down Expand Up @@ -182,44 +180,43 @@ def _cfg_sub(line):
initrd = "alt0/all.rdz"
flags = "ramdisk_size=128000 root=/dev/ram3 acpi=ht vga=788 automatic=method:cdrom"
else:
'''
Mageia 4 dual - isolinux/i586.cfg
isolinux/x86_64.cfg
isolinux/i586/vmlinuz
isolinux/i586/all.rdz
isolinux/x86_64/vmlinuz
isolinux/x86_64/all.rdz
Mageia 4 x86_64 - isolinux/isolinux.cfg
isolinux/x86_64/vmlinuz
isolinux/x86_64/all.rdz
Mageia 4 i586 - isolinux/isolinux.cfg
isolinux/i586/vmlinuz
isolinuz/i586/all.rdz
Mageia 4.1 dual - isolinux/i586.cfg
isolinux/x86_64.cfg
isolinux/i586/vmlinuz
isolinux/i586/all.rdz
isolinux/x86_64/vmlinuz
isolinux/x86_64/all.rdz
Mageia 4.1 x86_64 - isolinux/isolinux.cfg
isolinux/x86_64/vmlinuz
isolinux/x86_64/all.rdz
Mageia 4.1 i586 - isolinux/isolinux.cfg
isolinux/i586/vmlinuz
isolinux/i586/all.rdz
Mageia 5 dual - isolinux/i586.cfg
isolinux/x86_64.cfg
isolinux/i586/vmlinuz
isolinux/i586/all.rdz
isolinux/x86_64/vmlinuz
isolinux/x86_64/all.rdz
Mageia 5 x86_64 - isolinux/isolinux.cfg
isolinux/x86_64/vmlinuz
isolinux/x86_64/all.rdz
Mageia 5 i586 - isolinux/isolinux.cfg
isolinux/i586/vmlinuz
isolinux/i586/all.rdz
'''
# Mageia 4 dual - isolinux/i586.cfg
# isolinux/x86_64.cfg
# isolinux/i586/vmlinuz
# isolinux/i586/all.rdz
# isolinux/x86_64/vmlinuz
# isolinux/x86_64/all.rdz
# Mageia 4 x86_64 - isolinux/isolinux.cfg
# isolinux/x86_64/vmlinuz
# isolinux/x86_64/all.rdz
# Mageia 4 i586 - isolinux/isolinux.cfg
# isolinux/i586/vmlinuz
# isolinuz/i586/all.rdz
# Mageia 4.1 dual - isolinux/i586.cfg
# isolinux/x86_64.cfg
# isolinux/i586/vmlinuz
# isolinux/i586/all.rdz
# isolinux/x86_64/vmlinuz
# isolinux/x86_64/all.rdz
# Mageia 4.1 x86_64 - isolinux/isolinux.cfg
# isolinux/x86_64/vmlinuz
# isolinux/x86_64/all.rdz
# Mageia 4.1 i586 - isolinux/isolinux.cfg
# isolinux/i586/vmlinuz
# isolinux/i586/all.rdz
# Mageia 5 dual - isolinux/i586.cfg
# isolinux/x86_64.cfg
# isolinux/i586/vmlinuz
# isolinux/i586/all.rdz
# isolinux/x86_64/vmlinuz
# isolinux/x86_64/all.rdz
# Mageia 5 x86_64 - isolinux/isolinux.cfg
# isolinux/x86_64/vmlinuz
# isolinux/x86_64/all.rdz
# Mageia 5 i586 - isolinux/isolinux.cfg
# isolinux/i586/vmlinuz
# isolinux/i586/all.rdz

# Starting with Mageia 4, things are a lot more regular. The
# directory always starts with isolinux. If it is a dual ISO, then
# there is an i586.cfg and x86_64.cfg describing how to boot each
Expand Down Expand Up @@ -538,9 +535,9 @@ def do_icicle(self, guestaddr):

extrasplit = None
if self.tdl.icicle_extra_cmd:
extrastdout, stderr, retcode = self.guest_execute_command(guestaddr,
self.tdl.icicle_extra_cmd,
timeout=30)
extrastdout, stderr_unused, retcode_unused = self.guest_execute_command(guestaddr,
self.tdl.icicle_extra_cmd,
timeout=30)
extrasplit = extrastdout.split("\n")

if len(package_split) != len(extrasplit):
Expand Down

0 comments on commit 6bb10b5

Please sign in to comment.