Fix the 1st commit of #17: incompatible retcode of subprocess.getstatusoutput()

Fix the 1st commit of #17 which replaced commands.getstatusoutput() with
subprocess.getstatusoutput() without taking the change of the status code into account:

Unfortunately, the Python3 developers broke the compatibility: The return code changes:

python2 -c 'import commands  ; print(  commands.getstatusoutput("false"))'
(256, '')
python3 -c 'import subprocess; print(subprocess.getstatusoutput("false"))'
(1, '')

With commands.getstatusoutput(), you had to use this to get the actual exit code:

status = os.WEXITSTATUS(status)

These calls have to be removed because now they just shift away the error code:

As shown at benjaminp/six#207, the operation is just `status >> 8`

Luckily, the status code is checked to against 0 at most places, so there is no change
for these checks. There is only one location where a bit is checked. Fix this location too.

Also, that commit did not take into account that subprocess.get*output do not exist
in Python2, which goes against the directive by Andrew in PR #16 where he requires
that we keep Python2 working:

The current master branch works neither for Python2, nor Python3 - fix this breakage
in the 2nd commit.

Signed-off-by: Bernhard Kaindl <[email protected]>

Author: bernhardkaindl

XSConsoleDataUtils.py

@@ -382,7 +382,7 @@ def HandleMountFailure(self, inStatus, inOutput):
         # Entered after self.Unmount has run
         if self.vdi['SR']['type'] != 'udev' or self.vdi['SR']['content_type'] != 'disk':
             # Take special action for USB devices only, i.e. don't reformat SCSI disks, etc.
-            if inStatus == 8192: # Return code for empty CD drive
+            if inStatus == 32: # 32 is the mount(8) return code for mount failure, assuming empty CD drive
                 raise Exception(Lang("Drive is empty"))
             raise Exception(inOutput)
 

plugins-base/XSFeatureDRBackup.py

@@ -39,7 +39,6 @@ def DoAction(self, inSR):
             command = "%s/xe-backup-metadata -n -u %s" % (Config.Inst().HelperPath(), sr_uuid)
 
             status, output = subprocess.getstatusoutput(command)
-            status = os.WEXITSTATUS(status)
             initalize_vdi = ""
             if status == 3:
                initalize_vdi = "-c"

plugins-base/XSFeatureDRRestore.py

@@ -93,7 +93,6 @@ def HandleMethodChoice(self, inChoice, dryRun):
             Layout.Inst().TransientBanner(Lang("Restoring VM Metadata.  This may take a few minutes..."))
             command = "%s/xe-restore-metadata -y %s -u %s -x %s -d %s -m %s" % (Config.Inst().HelperPath(), dry_flag, self.sr_uuid, self.vdi_uuid, self.chosen_date, chosen_mode)
             status, output = subprocess.getstatusoutput(command)
-            status = os.WEXITSTATUS(status)
             Layout.Inst().PopDialogue()
             if status == 0:
                 Layout.Inst().PushDialogue(InfoDialogue(Lang("Metadata Restore Succeeded: ") + output))