diff --git a/oz-install b/oz-install index 13a2e706..b06f2517 100755 --- a/oz-install +++ b/oz-install @@ -150,6 +150,10 @@ def main(): guest = oz.GuestFactory.guest_factory(tdl, config, auto, output_disk, netdev, diskbus, macaddress) + # DO NOT MERGE! + if False == True: + badVariable = "whee" + if cleanup: guest.cleanup_old_guest() else: diff --git a/oz/Fedora.py b/oz/Fedora.py index 89ecca8c..d08c5060 100644 --- a/oz/Fedora.py +++ b/oz/Fedora.py @@ -259,6 +259,10 @@ def __init__(self, tdl, config, auto, nicmodel, haverepo, diskbus, # pylint: di diskbus = self.config.default_diskbus self.assumed_update = assumed_update + # DO NOT MERGE! + if False == True: + badVariable = "whee" + # Prior to Fedora-22, we use yum; on F-22 and later, we use dnf. oz.RedHat.RedHatLinuxCDYumGuest.__init__(self, tdl, config, auto, output_disk, nicmodel, diskbus,