From 5093a05142b3fe5139aa42584fedfc3c0d48321e Mon Sep 17 00:00:00 2001 From: Natalia Serrano Date: Mon, 14 Jul 2025 15:37:26 +0200 Subject: [PATCH 1/2] refs #2438 fail if ogfunctions return None --- ogclient/functions/ogAddCmd | 1 + ogclient/functions/ogAddRegistryKey | 1 + ogclient/functions/ogAddRegistryValue | 1 + ogclient/functions/ogBoot | 1 + ogclient/functions/ogBootLoaderDefaultEntry | 1 + ogclient/functions/ogBootLoaderDeleteEntry | 1 + ogclient/functions/ogBootLoaderHidePartitions | 1 + .../functions/ogBootLoaderOgliveDefaultEntry | 1 + ogclient/functions/ogBootLoaderSetTimeOut | 1 + ogclient/functions/ogBootMbrGeneric | 1 + ogclient/functions/ogBootMbrXP | 1 + ogclient/functions/ogCalculateChecksum | 1 + ogclient/functions/ogCalculateFullChecksum | 1 + ogclient/functions/ogChangeRepo | 1 + ogclient/functions/ogCheckFs | 1 + ogclient/functions/ogCheckIpAddress | 1 + ogclient/functions/ogCleanLinuxDevices | 1 + ogclient/functions/ogCleanOs | 1 + ogclient/functions/ogConfigureFstab | 1 + ogclient/functions/ogConfigureOgagent | 1 + ogclient/functions/ogCopyEfiBootLoader | 1 + ogclient/functions/ogCopyFile | 1 + ogclient/functions/ogCreateCache | 1 + ogclient/functions/ogCreateGptPartitions | 23 ------------------- ogclient/functions/ogCreateImage | 1 + ogclient/functions/ogCreateImageSyntax | 1 + ogclient/functions/ogCreatePartitionTable | 1 + ogclient/functions/ogCreatePartitions | 1 + ogclient/functions/ogCreateTorrent | 2 ++ ogclient/functions/ogDeleteCache | 1 + ogclient/functions/ogDeleteFile | 1 + ogclient/functions/ogDeletePartitionTable | 1 + ogclient/functions/ogDeleteRegistryKey | 1 + ogclient/functions/ogDeleteRegistryValue | 1 + ogclient/functions/ogDeleteTree | 1 + ogclient/functions/ogDevToDisk | 1 + ogclient/functions/ogDiskToDev | 1 + ogclient/functions/ogEcho | 1 + ogclient/functions/ogExecAndLog | 1 + ogclient/functions/ogExtendFs | 1 + ogclient/functions/ogFindCache | 1 + ogclient/functions/ogFixBootSector | 1 + ogclient/functions/ogFormat | 1 + ogclient/functions/ogFormatCache | 1 + ogclient/functions/ogFormatFs | 1 + ogclient/functions/ogGetArch | 1 + ogclient/functions/ogGetBootMbr | 1 + ogclient/functions/ogGetCacheSize | 1 + ogclient/functions/ogGetCacheSpace | 1 + ogclient/functions/ogGetCaller | 1 + ogclient/functions/ogGetDiskSize | 1 + ogclient/functions/ogGetDiskType | 1 + ogclient/functions/ogGetEsp | 1 + ogclient/functions/ogGetFreeSize | 1 + ogclient/functions/ogGetFsSize | 1 + ogclient/functions/ogGetFsType | 1 + ogclient/functions/ogGetHivePath | 1 + ogclient/functions/ogGetHostname | 1 + ogclient/functions/ogGetImageCompressor | 1 + ogclient/functions/ogGetImageInfo | 1 + ogclient/functions/ogGetImageProgram | 1 + ogclient/functions/ogGetImageSize | 1 + ogclient/functions/ogGetImageType | 1 + ogclient/functions/ogGetIpAddress | 1 + ogclient/functions/ogGetLastSector | 1 + ogclient/functions/ogGetMacAddress | 1 + ogclient/functions/ogGetMountPoint | 1 + ogclient/functions/ogGetOsType | 1 + ogclient/functions/ogGetOsUuid | 1 + ogclient/functions/ogGetOsVersion | 1 + ogclient/functions/ogGetParentPath | 1 + ogclient/functions/ogGetPartitionActive | 1 + ogclient/functions/ogGetPartitionId | 1 + ogclient/functions/ogGetPartitionSize | 1 + ogclient/functions/ogGetPartitionTableType | 1 + ogclient/functions/ogGetPartitionType | 1 + ogclient/functions/ogGetPartitionsNumber | 1 + ogclient/functions/ogGetPath | 1 + ogclient/functions/ogGetRegistryValue | 1 + ogclient/functions/ogGetRepoIp | 1 + ogclient/functions/ogGetSerialNumber | 1 + ogclient/functions/ogGetServerIp | 1 + ogclient/functions/ogGetWindowsName | 1 + ogclient/functions/ogGrub4dosInstallMbr | 1 + ogclient/functions/ogGrubAddOgLive | 1 + ogclient/functions/ogGrubDefaultEntry | 1 + ogclient/functions/ogGrubDeleteEntry | 1 + ogclient/functions/ogGrubHidePartitions | 1 + ogclient/functions/ogGrubInstallMbr | 1 + ogclient/functions/ogGrubInstallPartition | 1 + ogclient/functions/ogGrubOgliveDefaultEntry | 1 + ogclient/functions/ogGrubSecurity | 1 + ogclient/functions/ogGrubSetTimeOut | 1 + ogclient/functions/ogHelp | 1 + ogclient/functions/ogHidePartition | 1 + ogclient/functions/ogIdToType | 1 + ogclient/functions/ogInstallFirstBoot | 1 + ogclient/functions/ogInstallMiniSetup | 1 + ogclient/functions/ogInstallRunonce | 1 + ogclient/functions/ogIsDiskLocked | 1 + ogclient/functions/ogIsEfiActive | 1 + ogclient/functions/ogIsFormated | 1 + ogclient/functions/ogIsImageLocked | 1 + ogclient/functions/ogIsLocked | 1 + ogclient/functions/ogIsMounted | 1 + ogclient/functions/ogIsPartitionLocked | 1 + ogclient/functions/ogIsReadonly | 1 + ogclient/functions/ogIsRepoLocked | 1 + ogclient/functions/ogIsVirtualMachine | 1 + ogclient/functions/ogIsWritable | 1 + ogclient/functions/ogLinuxBootParameters | 1 + ogclient/functions/ogListHardwareInfo | 1 + ogclient/functions/ogListLogicalPartitions | 1 + ogclient/functions/ogListPartitions | 1 + ogclient/functions/ogListPrimaryPartitions | 1 + ogclient/functions/ogListRegistryKeys | 1 + ogclient/functions/ogListRegistryValues | 1 + ogclient/functions/ogListSoftware | 1 + ogclient/functions/ogLock | 1 + ogclient/functions/ogLockDisk | 1 + ogclient/functions/ogLockImage | 1 + ogclient/functions/ogLockPartition | 1 + ogclient/functions/ogMakeDir | 1 + ogclient/functions/ogMcastReceiverFile | 1 + ogclient/functions/ogMcastReceiverPartition | 1 + ogclient/functions/ogMcastSendFile | 1 + ogclient/functions/ogMcastSendPartition | 1 + ogclient/functions/ogMcastSyntax | 1 + ogclient/functions/ogMount | 1 + ogclient/functions/ogMountCache | 1 + ogclient/functions/ogMountCdrom | 1 + ogclient/functions/ogMountFirstFs | 1 + ogclient/functions/ogMountFs | 1 + ogclient/functions/ogNvramActiveEntry | 1 + ogclient/functions/ogNvramAddEntry | 1 + ogclient/functions/ogNvramDeleteEntry | 1 + ogclient/functions/ogNvramGetCurrent | 1 + ogclient/functions/ogNvramGetNext | 1 + ogclient/functions/ogNvramGetOrder | 1 + ogclient/functions/ogNvramGetTimeout | 1 + ogclient/functions/ogNvramInactiveEntry | 1 + ogclient/functions/ogNvramList | 1 + ogclient/functions/ogNvramPxeFirstEntry | 1 + ogclient/functions/ogNvramSetNext | 1 + ogclient/functions/ogNvramSetOrder | 1 + ogclient/functions/ogNvramSetTimeout | 1 + ogclient/functions/ogRaiseError | 1 + ogclient/functions/ogReduceFs | 1 + ogclient/functions/ogRestoreEfiBootLoader | 1 + ogclient/functions/ogRestoreImage | 1 + ogclient/functions/ogRestoreImageSyntax | 1 + ogclient/functions/ogSetLinuxName | 1 + ogclient/functions/ogSetPartitionActive | 1 + ogclient/functions/ogSetPartitionId | 1 + ogclient/functions/ogSetPartitionSize | 1 + ogclient/functions/ogSetPartitionType | 1 + ogclient/functions/ogSetRegistryValue | 1 + ogclient/functions/ogSetWindowsName | 1 + ogclient/functions/ogSetWinlogonUser | 1 + ogclient/functions/ogTorrentStart | 1 + ogclient/functions/ogTypeToId | 1 + ogclient/functions/ogUcastReceiverPartition | 1 + ogclient/functions/ogUcastSendFile | 1 + ogclient/functions/ogUcastSendPartition | 1 + ogclient/functions/ogUcastSyntax | 1 + ogclient/functions/ogUnhidePartition | 1 + ogclient/functions/ogUninstallLinuxClient | 1 + ogclient/functions/ogUninstallWindowsClient | 1 + ogclient/functions/ogUnlock | 1 + ogclient/functions/ogUnlockDisk | 1 + ogclient/functions/ogUnlockImage | 1 + ogclient/functions/ogUnlockPartition | 1 + ogclient/functions/ogUnmount | 1 + ogclient/functions/ogUnmountAll | 1 + ogclient/functions/ogUnmountCache | 1 + ogclient/functions/ogUnmountFs | 1 + ogclient/functions/ogUnsetDirtyBit | 1 + ogclient/functions/ogUpdateCacheIsNecesary | 1 + ogclient/functions/ogUpdatePartitionTable | 1 + ogclient/functions/ogWindowsBootParameters | 1 + ogclient/functions/ogWindowsRegisterPartition | 1 + 181 files changed, 181 insertions(+), 23 deletions(-) delete mode 100755 ogclient/functions/ogCreateGptPartitions diff --git a/ogclient/functions/ogAddCmd b/ogclient/functions/ogAddCmd index 8c0b913..54a978b 100755 --- a/ogclient/functions/ogAddCmd +++ b/ogclient/functions/ogAddCmd @@ -19,6 +19,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogAddCmd (args.disk, args.par, args.cmdfile, args.cmd) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogAddRegistryKey b/ogclient/functions/ogAddRegistryKey index 8b0c59b..cb24b94 100755 --- a/ogclient/functions/ogAddRegistryKey +++ b/ogclient/functions/ogAddRegistryKey @@ -18,6 +18,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogAddRegistryKey (args.mntpt, args.hive, args.k) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogAddRegistryValue b/ogclient/functions/ogAddRegistryValue index d4dd054..499e228 100755 --- a/ogclient/functions/ogAddRegistryValue +++ b/ogclient/functions/ogAddRegistryValue @@ -19,6 +19,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogAddRegistryValue (args.mntpt, args.hive, args.k, args.vtype) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogBoot b/ogclient/functions/ogBoot index 23756c1..703a3b3 100755 --- a/ogclient/functions/ogBoot +++ b/ogclient/functions/ogBoot @@ -39,6 +39,7 @@ elif 4 == len (sys.argv): elif 5 == len (sys.argv): ret = ogBoot (args.disk, args.par, not not args.nvramperm, args.params) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogBootLoaderDefaultEntry b/ogclient/functions/ogBootLoaderDefaultEntry index fc99085..10ec1d6 100755 --- a/ogclient/functions/ogBootLoaderDefaultEntry +++ b/ogclient/functions/ogBootLoaderDefaultEntry @@ -20,6 +20,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogBootLoaderDefaultEntry (args.disk, args.par, args.diskdefault, args.pardefault) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogBootLoaderDeleteEntry b/ogclient/functions/ogBootLoaderDeleteEntry index 1d1c21d..6a7d148 100755 --- a/ogclient/functions/ogBootLoaderDeleteEntry +++ b/ogclient/functions/ogBootLoaderDeleteEntry @@ -20,6 +20,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogBootLoaderDeleteEntry (args.disk, args.par, args.diskdel, args.pardel) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogBootLoaderHidePartitions b/ogclient/functions/ogBootLoaderHidePartitions index 57a4fda..238e46b 100755 --- a/ogclient/functions/ogBootLoaderHidePartitions +++ b/ogclient/functions/ogBootLoaderHidePartitions @@ -27,6 +27,7 @@ if 3 == len (sys.argv): elif 5 == len (sys.argv): ret = ogBootLoaderHidePartitions (args.disk, args.par, args.datadisk, args.datapar) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogBootLoaderOgliveDefaultEntry b/ogclient/functions/ogBootLoaderOgliveDefaultEntry index 17866ae..684043c 100755 --- a/ogclient/functions/ogBootLoaderOgliveDefaultEntry +++ b/ogclient/functions/ogBootLoaderOgliveDefaultEntry @@ -18,6 +18,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogBootLoaderOgliveDefaultEntry (args.disk, args.par) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogBootLoaderSetTimeOut b/ogclient/functions/ogBootLoaderSetTimeOut index b2782e8..0a24738 100755 --- a/ogclient/functions/ogBootLoaderSetTimeOut +++ b/ogclient/functions/ogBootLoaderSetTimeOut @@ -19,6 +19,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogBootLoaderSetTimeOut (args.disk, args.par, args.timeout) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogBootMbrGeneric b/ogclient/functions/ogBootMbrGeneric index 48cde7f..bc5bf6a 100755 --- a/ogclient/functions/ogBootMbrGeneric +++ b/ogclient/functions/ogBootMbrGeneric @@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogBootMbrGeneric (args.disk) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogBootMbrXP b/ogclient/functions/ogBootMbrXP index 8a15f08..e0b54a2 100755 --- a/ogclient/functions/ogBootMbrXP +++ b/ogclient/functions/ogBootMbrXP @@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogBootMbrXP (args.disk) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogCalculateChecksum b/ogclient/functions/ogCalculateChecksum index d55da2e..8c6c5d4 100755 --- a/ogclient/functions/ogCalculateChecksum +++ b/ogclient/functions/ogCalculateChecksum @@ -26,6 +26,7 @@ if 3 == len (sys.argv): elif 4 == len (sys.argv): ret = ogCalculateChecksum (container=f'{args.disk} {args.par}', file=args.file) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogCalculateFullChecksum b/ogclient/functions/ogCalculateFullChecksum index f871f03..009c590 100755 --- a/ogclient/functions/ogCalculateFullChecksum +++ b/ogclient/functions/ogCalculateFullChecksum @@ -26,6 +26,7 @@ if 3 == len (sys.argv): elif 4 == len (sys.argv): ret = ogCalculateFullChecksum (container=f'{args.disk} {args.par}', file=args.file) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogChangeRepo b/ogclient/functions/ogChangeRepo index 78d08e9..d9cd8ef 100755 --- a/ogclient/functions/ogChangeRepo +++ b/ogclient/functions/ogChangeRepo @@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogChangeRepo (args.ip_repo) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogCheckFs b/ogclient/functions/ogCheckFs index 7eade6a..9e01632 100755 --- a/ogclient/functions/ogCheckFs +++ b/ogclient/functions/ogCheckFs @@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogCheckFs (args.disk, args.par) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogCheckIpAddress b/ogclient/functions/ogCheckIpAddress index 0e25310..636b187 100755 --- a/ogclient/functions/ogCheckIpAddress +++ b/ogclient/functions/ogCheckIpAddress @@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogCheckIpAddress (args.ip) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogCleanLinuxDevices b/ogclient/functions/ogCleanLinuxDevices index 7603084..8cfbe49 100755 --- a/ogclient/functions/ogCleanLinuxDevices +++ b/ogclient/functions/ogCleanLinuxDevices @@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogCleanLinuxDevices (args.disk, args.par) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogCleanOs b/ogclient/functions/ogCleanOs index e2309c6..05bbe0b 100755 --- a/ogclient/functions/ogCleanOs +++ b/ogclient/functions/ogCleanOs @@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogCleanOs (args.disk, args.par) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogConfigureFstab b/ogclient/functions/ogConfigureFstab index 03d351d..73e7430 100755 --- a/ogclient/functions/ogConfigureFstab +++ b/ogclient/functions/ogConfigureFstab @@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogConfigureFstab (args.disk, args.par) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogConfigureOgagent b/ogclient/functions/ogConfigureOgagent index 7ed9fcd..3d8afa4 100755 --- a/ogclient/functions/ogConfigureOgagent +++ b/ogclient/functions/ogConfigureOgagent @@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogConfigureOgagent (args.disk, args.par) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogCopyEfiBootLoader b/ogclient/functions/ogCopyEfiBootLoader index 41d5d9b..91fe35f 100755 --- a/ogclient/functions/ogCopyEfiBootLoader +++ b/ogclient/functions/ogCopyEfiBootLoader @@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogCopyEfiBootLoader (args.disk, args.par) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogCopyFile b/ogclient/functions/ogCopyFile index 522b9e7..cf7260a 100755 --- a/ogclient/functions/ogCopyFile +++ b/ogclient/functions/ogCopyFile @@ -86,6 +86,7 @@ else: sys.exit (1) ret = ogCopyFile (src, dst) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogCreateCache b/ogclient/functions/ogCreateCache index 62a97e5..dc6e6b9 100755 --- a/ogclient/functions/ogCreateCache +++ b/ogclient/functions/ogCreateCache @@ -30,6 +30,7 @@ elif 3 == len (sys.argv): elif 4 == len (sys.argv): ret = ogCreateCache (ndsk=int(args.disk), part=int(args.part), sizecache=int(args.sizecache)) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogCreateGptPartitions b/ogclient/functions/ogCreateGptPartitions deleted file mode 100755 index 0259325..0000000 --- a/ogclient/functions/ogCreateGptPartitions +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/python3 - -import sys -import argparse -from SystemLib import ogHelp -from DiskLib import ogCreateGptPartitions - -if 2 == len (sys.argv) and 'help' == sys.argv[1]: - #parser.print_help() sale en inglés aunque la locale indique otra cosa - ogHelp ('ogCreateGptPartitions', 'ogCreateGptPartitions int_ndisk str_parttype:int_partsize ...', ['ogCreateGptPartitions 1 NTFS:10000000 EXT3:5000000 LINUX-SWAP:1000000']) - sys.exit (0) - -parser = argparse.ArgumentParser (add_help=False) -parser.add_argument ('disk') -parser.add_argument ('parts', nargs='+') -args = parser.parse_args() - -ret = ogCreateGptPartitions (args.disk, args.parts) - -if ret is not None: - if ret == True: sys.exit (0) - elif ret == False: sys.exit (1) - else: print (ret) diff --git a/ogclient/functions/ogCreateImage b/ogclient/functions/ogCreateImage index 14c9709..17ce0e1 100755 --- a/ogclient/functions/ogCreateImage +++ b/ogclient/functions/ogCreateImage @@ -31,6 +31,7 @@ if 5 == len (sys.argv): elif 7 == len (sys.argv): ret = ogCreateImage (args.disk, args.par, args.container, args.imgfile, args.tool, args.level) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogCreateImageSyntax b/ogclient/functions/ogCreateImageSyntax index bc3651b..55d80ad 100755 --- a/ogclient/functions/ogCreateImageSyntax +++ b/ogclient/functions/ogCreateImageSyntax @@ -19,6 +19,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogCreateImageSyntax (args.dev, args.imgfile, args.tool, args.level) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogCreatePartitionTable b/ogclient/functions/ogCreatePartitionTable index 415c10c..d6cc57f 100755 --- a/ogclient/functions/ogCreatePartitionTable +++ b/ogclient/functions/ogCreatePartitionTable @@ -24,6 +24,7 @@ if 2 == len (sys.argv): elif 3 == len (sys.argv): ret = ogCreatePartitionTable (args.disk, args.createptt) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogCreatePartitions b/ogclient/functions/ogCreatePartitions index 8269a53..9d7adb8 100755 --- a/ogclient/functions/ogCreatePartitions +++ b/ogclient/functions/ogCreatePartitions @@ -17,6 +17,7 @@ args = parser.parse_args() ret = ogCreatePartitions (args.disk, args.parts) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogCreateTorrent b/ogclient/functions/ogCreateTorrent index 409bd31..900c8e1 100755 --- a/ogclient/functions/ogCreateTorrent +++ b/ogclient/functions/ogCreateTorrent @@ -25,6 +25,8 @@ if 4 == len (sys.argv): ret = ogCreateTorrent (container=args.container, file=args.file, ip_bttrack=args.ip_bttrack) elif 5 == len (sys.argv): ret = ogCreateTorrent (disk=args.disk, par=args.par, file=args.file, ip_bttrack=args.ip_bttrack) + +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogDeleteCache b/ogclient/functions/ogDeleteCache index 80914b8..9719a1a 100755 --- a/ogclient/functions/ogDeleteCache +++ b/ogclient/functions/ogDeleteCache @@ -7,6 +7,7 @@ from CacheLib import ogDeleteCache ret = ogDeleteCache() +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogDeleteFile b/ogclient/functions/ogDeleteFile index 32d4763..eafb735 100755 --- a/ogclient/functions/ogDeleteFile +++ b/ogclient/functions/ogDeleteFile @@ -26,6 +26,7 @@ if 3 == len (sys.argv): elif 4 == len (sys.argv): ret = ogDeleteFile (container=f'{args.disk} {args.par}', file=args.file) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogDeletePartitionTable b/ogclient/functions/ogDeletePartitionTable index 5d35b5d..609633b 100755 --- a/ogclient/functions/ogDeletePartitionTable +++ b/ogclient/functions/ogDeletePartitionTable @@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogDeletePartitionTable (args.disk) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogDeleteRegistryKey b/ogclient/functions/ogDeleteRegistryKey index 3eba2e1..6592f00 100755 --- a/ogclient/functions/ogDeleteRegistryKey +++ b/ogclient/functions/ogDeleteRegistryKey @@ -18,6 +18,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogDeleteRegistryKey (args.mntpt, args.hive, args.k) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogDeleteRegistryValue b/ogclient/functions/ogDeleteRegistryValue index 7721bfa..852c897 100755 --- a/ogclient/functions/ogDeleteRegistryValue +++ b/ogclient/functions/ogDeleteRegistryValue @@ -18,6 +18,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogDeleteRegistryValue (args.mntpt, args.hive, args.k) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogDeleteTree b/ogclient/functions/ogDeleteTree index 527b1a5..ad16b86 100755 --- a/ogclient/functions/ogDeleteTree +++ b/ogclient/functions/ogDeleteTree @@ -26,6 +26,7 @@ if 3 == len (sys.argv): elif 4 == len (sys.argv): ret = ogDeleteTree (container=f'{args.disk} {args.par}', file=args.file) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogDevToDisk b/ogclient/functions/ogDevToDisk index b3d6fea..e3650bd 100755 --- a/ogclient/functions/ogDevToDisk +++ b/ogclient/functions/ogDevToDisk @@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogDevToDisk (args.arg_dev) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogDiskToDev b/ogclient/functions/ogDiskToDev index d12736d..d388bee 100755 --- a/ogclient/functions/ogDiskToDev +++ b/ogclient/functions/ogDiskToDev @@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogDiskToDev (args.arg_disk, args.arg_part) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogEcho b/ogclient/functions/ogEcho index 14d8bf5..daf8ffa 100755 --- a/ogclient/functions/ogEcho +++ b/ogclient/functions/ogEcho @@ -18,6 +18,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogEcho (args.logtypes, args.loglevel, args.msg) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogExecAndLog b/ogclient/functions/ogExecAndLog index 977f6b4..1454d78 100755 --- a/ogclient/functions/ogExecAndLog +++ b/ogclient/functions/ogExecAndLog @@ -48,6 +48,7 @@ for arg in sys.argv[1:]: args = tuple (args) ret = ogExecAndLog (logtypes, fun, *args, **kwargs) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogExtendFs b/ogclient/functions/ogExtendFs index b706e87..5277e03 100755 --- a/ogclient/functions/ogExtendFs +++ b/ogclient/functions/ogExtendFs @@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogExtendFs (args.disk, args.par) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogFindCache b/ogclient/functions/ogFindCache index 181872d..470c00f 100755 --- a/ogclient/functions/ogFindCache +++ b/ogclient/functions/ogFindCache @@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogFindCache () +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogFixBootSector b/ogclient/functions/ogFixBootSector index 3e9ecb5..b7cfb08 100755 --- a/ogclient/functions/ogFixBootSector +++ b/ogclient/functions/ogFixBootSector @@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogFixBootSector (args.disk, args.par) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogFormat b/ogclient/functions/ogFormat index cc955a2..89c0059 100755 --- a/ogclient/functions/ogFormat +++ b/ogclient/functions/ogFormat @@ -22,6 +22,7 @@ else: args = parser.parse_args() ret = ogFormat (args.disk, args.par, args.fs, args.label) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogFormatCache b/ogclient/functions/ogFormatCache index 375d8b2..f5422f2 100755 --- a/ogclient/functions/ogFormatCache +++ b/ogclient/functions/ogFormatCache @@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogFormatCache () +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogFormatFs b/ogclient/functions/ogFormatFs index babe6ef..0d4edde 100755 --- a/ogclient/functions/ogFormatFs +++ b/ogclient/functions/ogFormatFs @@ -19,6 +19,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogFormatFs (args.disk, args.par, args.type, args.label) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogGetArch b/ogclient/functions/ogGetArch index bf24319..e43bb58 100755 --- a/ogclient/functions/ogGetArch +++ b/ogclient/functions/ogGetArch @@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogGetArch () +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogGetBootMbr b/ogclient/functions/ogGetBootMbr index 5c3c887..c58bb8b 100755 --- a/ogclient/functions/ogGetBootMbr +++ b/ogclient/functions/ogGetBootMbr @@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogGetBootMbr (args.disk) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogGetCacheSize b/ogclient/functions/ogGetCacheSize index 51a73dc..8835514 100755 --- a/ogclient/functions/ogGetCacheSize +++ b/ogclient/functions/ogGetCacheSize @@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogGetCacheSize () +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogGetCacheSpace b/ogclient/functions/ogGetCacheSpace index 2e5dce3..4f7af30 100755 --- a/ogclient/functions/ogGetCacheSpace +++ b/ogclient/functions/ogGetCacheSpace @@ -7,6 +7,7 @@ from CacheLib import ogGetCacheSpace ret = ogGetCacheSpace() +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogGetCaller b/ogclient/functions/ogGetCaller index 2147fb2..f17d9ae 100755 --- a/ogclient/functions/ogGetCaller +++ b/ogclient/functions/ogGetCaller @@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogGetCaller () +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogGetDiskSize b/ogclient/functions/ogGetDiskSize index ea7c42e..e25f727 100755 --- a/ogclient/functions/ogGetDiskSize +++ b/ogclient/functions/ogGetDiskSize @@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogGetDiskSize (args.disk) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogGetDiskType b/ogclient/functions/ogGetDiskType index 022482f..b59c35d 100755 --- a/ogclient/functions/ogGetDiskType +++ b/ogclient/functions/ogGetDiskType @@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogGetDiskType (args.dev) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogGetEsp b/ogclient/functions/ogGetEsp index 3431956..50f9822 100755 --- a/ogclient/functions/ogGetEsp +++ b/ogclient/functions/ogGetEsp @@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogGetEsp () +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogGetFreeSize b/ogclient/functions/ogGetFreeSize index 5f1899e..a708312 100755 --- a/ogclient/functions/ogGetFreeSize +++ b/ogclient/functions/ogGetFreeSize @@ -18,6 +18,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogGetFreeSize (args.disk, args.part, args.unit) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogGetFsSize b/ogclient/functions/ogGetFsSize index 9227810..c3b5ba2 100755 --- a/ogclient/functions/ogGetFsSize +++ b/ogclient/functions/ogGetFsSize @@ -18,6 +18,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogGetFsSize (args.disk, args.par, args.unit) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogGetFsType b/ogclient/functions/ogGetFsType index d89b09f..1161c13 100755 --- a/ogclient/functions/ogGetFsType +++ b/ogclient/functions/ogGetFsType @@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogGetFsType (args.disk, args.part) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogGetHivePath b/ogclient/functions/ogGetHivePath index ebac741..5f07a82 100755 --- a/ogclient/functions/ogGetHivePath +++ b/ogclient/functions/ogGetHivePath @@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogGetHivePath (args.mntpt, args.hive) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogGetHostname b/ogclient/functions/ogGetHostname index d042a3c..465a966 100755 --- a/ogclient/functions/ogGetHostname +++ b/ogclient/functions/ogGetHostname @@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogGetHostname () +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogGetImageCompressor b/ogclient/functions/ogGetImageCompressor index 7b21fb3..b0f7325 100755 --- a/ogclient/functions/ogGetImageCompressor +++ b/ogclient/functions/ogGetImageCompressor @@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogGetImageCompressor (args.container, args.filename) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogGetImageInfo b/ogclient/functions/ogGetImageInfo index f227f2c..cf0c6f7 100755 --- a/ogclient/functions/ogGetImageInfo +++ b/ogclient/functions/ogGetImageInfo @@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogGetImageInfo (args.imgfile) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogGetImageProgram b/ogclient/functions/ogGetImageProgram index 80b2a15..ea6f2d3 100755 --- a/ogclient/functions/ogGetImageProgram +++ b/ogclient/functions/ogGetImageProgram @@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogGetImageProgram (args.container, args.filename) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogGetImageSize b/ogclient/functions/ogGetImageSize index da45ec8..50f83f4 100755 --- a/ogclient/functions/ogGetImageSize +++ b/ogclient/functions/ogGetImageSize @@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogGetImageSize (args.repo, args.imgname) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogGetImageType b/ogclient/functions/ogGetImageType index 304f030..1cac07a 100755 --- a/ogclient/functions/ogGetImageType +++ b/ogclient/functions/ogGetImageType @@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogGetImageType (args.repo, args.imgname) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogGetIpAddress b/ogclient/functions/ogGetIpAddress index 4a3e976..17783c3 100755 --- a/ogclient/functions/ogGetIpAddress +++ b/ogclient/functions/ogGetIpAddress @@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogGetIpAddress () +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogGetLastSector b/ogclient/functions/ogGetLastSector index 4723660..bd65261 100755 --- a/ogclient/functions/ogGetLastSector +++ b/ogclient/functions/ogGetLastSector @@ -24,6 +24,7 @@ if 2 == len (sys.argv): elif 3 == len (sys.argv): ret = ogGetLastSector (args.disk, args.par) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogGetMacAddress b/ogclient/functions/ogGetMacAddress index b3585f4..9a9832b 100755 --- a/ogclient/functions/ogGetMacAddress +++ b/ogclient/functions/ogGetMacAddress @@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogGetMacAddress () +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogGetMountPoint b/ogclient/functions/ogGetMountPoint index 9cb0625..31cf817 100755 --- a/ogclient/functions/ogGetMountPoint +++ b/ogclient/functions/ogGetMountPoint @@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogGetMountPoint (args.disk, args.par) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogGetOsType b/ogclient/functions/ogGetOsType index 77a6f29..d9af3f5 100755 --- a/ogclient/functions/ogGetOsType +++ b/ogclient/functions/ogGetOsType @@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogGetOsType (args.disk, args.partition) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogGetOsUuid b/ogclient/functions/ogGetOsUuid index 306d96c..1bebc57 100755 --- a/ogclient/functions/ogGetOsUuid +++ b/ogclient/functions/ogGetOsUuid @@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogGetOsUuid (args.disk, args.par) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogGetOsVersion b/ogclient/functions/ogGetOsVersion index a91fec6..d93513f 100755 --- a/ogclient/functions/ogGetOsVersion +++ b/ogclient/functions/ogGetOsVersion @@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogGetOsVersion (args.disk, args.part) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogGetParentPath b/ogclient/functions/ogGetParentPath index 3051970..9df790b 100755 --- a/ogclient/functions/ogGetParentPath +++ b/ogclient/functions/ogGetParentPath @@ -26,6 +26,7 @@ if 3 == len (sys.argv): elif 4 == len (sys.argv): ret = ogGetParentPath (src=f'{args.disk} {args.par}', file=args.file) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogGetPartitionActive b/ogclient/functions/ogGetPartitionActive index ce516bc..1c0c62b 100755 --- a/ogclient/functions/ogGetPartitionActive +++ b/ogclient/functions/ogGetPartitionActive @@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogGetPartitionActive (args.disk) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogGetPartitionId b/ogclient/functions/ogGetPartitionId index dfcae9b..e6b634e 100755 --- a/ogclient/functions/ogGetPartitionId +++ b/ogclient/functions/ogGetPartitionId @@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogGetPartitionId (args.disk, args.par) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogGetPartitionSize b/ogclient/functions/ogGetPartitionSize index 0ea7767..f9846c5 100755 --- a/ogclient/functions/ogGetPartitionSize +++ b/ogclient/functions/ogGetPartitionSize @@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogGetPartitionSize (args.disk, args.par) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogGetPartitionTableType b/ogclient/functions/ogGetPartitionTableType index 262ad62..31afaa6 100755 --- a/ogclient/functions/ogGetPartitionTableType +++ b/ogclient/functions/ogGetPartitionTableType @@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogGetPartitionTableType (args.disk) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogGetPartitionType b/ogclient/functions/ogGetPartitionType index 51e6644..da66f66 100755 --- a/ogclient/functions/ogGetPartitionType +++ b/ogclient/functions/ogGetPartitionType @@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogGetPartitionType (args.disk, args.par) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogGetPartitionsNumber b/ogclient/functions/ogGetPartitionsNumber index de6bbe7..ae9d6a5 100755 --- a/ogclient/functions/ogGetPartitionsNumber +++ b/ogclient/functions/ogGetPartitionsNumber @@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogGetPartitionsNumber (args.disk) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogGetPath b/ogclient/functions/ogGetPath index d40cc5e..fae3618 100755 --- a/ogclient/functions/ogGetPath +++ b/ogclient/functions/ogGetPath @@ -30,6 +30,7 @@ elif 3 == len (sys.argv): elif 4 == len (sys.argv): ret = ogGetPath (src=f'{args.disk} {args.par}', file=args.file) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogGetRegistryValue b/ogclient/functions/ogGetRegistryValue index c3645a5..9fbec0e 100755 --- a/ogclient/functions/ogGetRegistryValue +++ b/ogclient/functions/ogGetRegistryValue @@ -18,6 +18,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogGetRegistryValue (args.mntpt, args.hive, args.k) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogGetRepoIp b/ogclient/functions/ogGetRepoIp index 6d89ff6..36bd018 100755 --- a/ogclient/functions/ogGetRepoIp +++ b/ogclient/functions/ogGetRepoIp @@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogGetRepoIp () +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogGetSerialNumber b/ogclient/functions/ogGetSerialNumber index dc02c8e..fb05382 100755 --- a/ogclient/functions/ogGetSerialNumber +++ b/ogclient/functions/ogGetSerialNumber @@ -11,6 +11,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: ret = ogGetSerialNumber() +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogGetServerIp b/ogclient/functions/ogGetServerIp index 7f23a8f..6d51281 100755 --- a/ogclient/functions/ogGetServerIp +++ b/ogclient/functions/ogGetServerIp @@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogGetServerIp () +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogGetWindowsName b/ogclient/functions/ogGetWindowsName index a0de62f..f38ef12 100755 --- a/ogclient/functions/ogGetWindowsName +++ b/ogclient/functions/ogGetWindowsName @@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogGetWindowsName (args.disk, args.par) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogGrub4dosInstallMbr b/ogclient/functions/ogGrub4dosInstallMbr index b76ebb3..266a782 100755 --- a/ogclient/functions/ogGrub4dosInstallMbr +++ b/ogclient/functions/ogGrub4dosInstallMbr @@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogGrub4dosInstallMbr (args.disk, args.par) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogGrubAddOgLive b/ogclient/functions/ogGrubAddOgLive index 7b50aa7..812bafa 100755 --- a/ogclient/functions/ogGrubAddOgLive +++ b/ogclient/functions/ogGrubAddOgLive @@ -19,6 +19,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogGrubAddOgLive (args.disk, args.par, args.timeout, args.offline) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogGrubDefaultEntry b/ogclient/functions/ogGrubDefaultEntry index e006e74..b80053c 100755 --- a/ogclient/functions/ogGrubDefaultEntry +++ b/ogclient/functions/ogGrubDefaultEntry @@ -19,6 +19,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogGrubDefaultEntry (args.disk, args.par, args.diskdefault, args.pardefault) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogGrubDeleteEntry b/ogclient/functions/ogGrubDeleteEntry index d10f764..8658c08 100755 --- a/ogclient/functions/ogGrubDeleteEntry +++ b/ogclient/functions/ogGrubDeleteEntry @@ -19,6 +19,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogGrubDeleteEntry (args.disk, args.par, args.diskdel, args.pardel) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogGrubHidePartitions b/ogclient/functions/ogGrubHidePartitions index 6fa7202..f5730d4 100755 --- a/ogclient/functions/ogGrubHidePartitions +++ b/ogclient/functions/ogGrubHidePartitions @@ -27,6 +27,7 @@ if 3 == len (sys.argv): elif 5 == len (sys.argv): ret = ogGrubHidePartitions (args.disk, args.par, args.datadisk, args.datapar) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogGrubInstallMbr b/ogclient/functions/ogGrubInstallMbr index 97a7497..a577081 100755 --- a/ogclient/functions/ogGrubInstallMbr +++ b/ogclient/functions/ogGrubInstallMbr @@ -19,6 +19,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogGrubInstallMbr (args.disk, args.par, args.checkos, args.kernelparam) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogGrubInstallPartition b/ogclient/functions/ogGrubInstallPartition index eca057a..e514497 100755 --- a/ogclient/functions/ogGrubInstallPartition +++ b/ogclient/functions/ogGrubInstallPartition @@ -19,6 +19,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogGrubInstallPartition (args.disk, args.par, args.checkos, args.kernelparam) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogGrubOgliveDefaultEntry b/ogclient/functions/ogGrubOgliveDefaultEntry index bd4c6b7..9cf962d 100755 --- a/ogclient/functions/ogGrubOgliveDefaultEntry +++ b/ogclient/functions/ogGrubOgliveDefaultEntry @@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogGrubOgliveDefaultEntry (args.disk, args.par) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogGrubSecurity b/ogclient/functions/ogGrubSecurity index 7895ea9..79a71b4 100755 --- a/ogclient/functions/ogGrubSecurity +++ b/ogclient/functions/ogGrubSecurity @@ -19,6 +19,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogGrubSecurity (args.disk, args.par, args.user, args.passwd) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogGrubSetTimeOut b/ogclient/functions/ogGrubSetTimeOut index 73a3629..faa4991 100755 --- a/ogclient/functions/ogGrubSetTimeOut +++ b/ogclient/functions/ogGrubSetTimeOut @@ -18,6 +18,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogGrubSetTimeOut (args.disk, args.par, args.timeout) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogHelp b/ogclient/functions/ogHelp index e26329f..92b4d13 100755 --- a/ogclient/functions/ogHelp +++ b/ogclient/functions/ogHelp @@ -18,6 +18,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogHelp (args.fname, args.fmt, args.examples) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogHidePartition b/ogclient/functions/ogHidePartition index 2a97ce1..046dcd6 100755 --- a/ogclient/functions/ogHidePartition +++ b/ogclient/functions/ogHidePartition @@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogHidePartition (args.disk, args.par) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogIdToType b/ogclient/functions/ogIdToType index 50bec6e..e679983 100755 --- a/ogclient/functions/ogIdToType +++ b/ogclient/functions/ogIdToType @@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogIdToType (args.id) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogInstallFirstBoot b/ogclient/functions/ogInstallFirstBoot index ea54b00..9a1a29f 100755 --- a/ogclient/functions/ogInstallFirstBoot +++ b/ogclient/functions/ogInstallFirstBoot @@ -18,6 +18,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogInstallFirstBoot (args.disk, args.par, args.cmdfile) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogInstallMiniSetup b/ogclient/functions/ogInstallMiniSetup index 4ffcec0..e3a45e4 100755 --- a/ogclient/functions/ogInstallMiniSetup +++ b/ogclient/functions/ogInstallMiniSetup @@ -29,6 +29,7 @@ else: args = parser.parse_args() ret = ogInstallMiniSetup (args.disk, args.par, args.cmdfile, args.user, args.pwd, args.autologin, args.userauto, args.pwdauto) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogInstallRunonce b/ogclient/functions/ogInstallRunonce index 5d52354..f8bbdbb 100755 --- a/ogclient/functions/ogInstallRunonce +++ b/ogclient/functions/ogInstallRunonce @@ -23,6 +23,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogInstallRunonce (args.disk, args.par, args.cmdfile, args.user, args.pwd, args.autologin, args.userauto, args.pwdauto) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogIsDiskLocked b/ogclient/functions/ogIsDiskLocked index 25ebde8..939fcab 100755 --- a/ogclient/functions/ogIsDiskLocked +++ b/ogclient/functions/ogIsDiskLocked @@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogIsDiskLocked (args.disk) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogIsEfiActive b/ogclient/functions/ogIsEfiActive index 099ef7b..ffc73ac 100755 --- a/ogclient/functions/ogIsEfiActive +++ b/ogclient/functions/ogIsEfiActive @@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogIsEfiActive () +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogIsFormated b/ogclient/functions/ogIsFormated index 3ab17f0..6edff7d 100755 --- a/ogclient/functions/ogIsFormated +++ b/ogclient/functions/ogIsFormated @@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogIsFormated (args.disk, args.part) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogIsImageLocked b/ogclient/functions/ogIsImageLocked index 5d9bdb6..879bb6c 100755 --- a/ogclient/functions/ogIsImageLocked +++ b/ogclient/functions/ogIsImageLocked @@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogIsImageLocked (args.container, args.imgfile) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogIsLocked b/ogclient/functions/ogIsLocked index 6523cf8..36a9bb6 100755 --- a/ogclient/functions/ogIsLocked +++ b/ogclient/functions/ogIsLocked @@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogIsLocked (args.disk, args.par) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogIsMounted b/ogclient/functions/ogIsMounted index 1158a65..1e43374 100755 --- a/ogclient/functions/ogIsMounted +++ b/ogclient/functions/ogIsMounted @@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogIsMounted (args.disk, args.par) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogIsPartitionLocked b/ogclient/functions/ogIsPartitionLocked index f340264..aefe444 100755 --- a/ogclient/functions/ogIsPartitionLocked +++ b/ogclient/functions/ogIsPartitionLocked @@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogIsPartitionLocked (args.disk, args.par) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogIsReadonly b/ogclient/functions/ogIsReadonly index 6a20026..e986a62 100755 --- a/ogclient/functions/ogIsReadonly +++ b/ogclient/functions/ogIsReadonly @@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogIsReadonly (args.disk, args.par) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogIsRepoLocked b/ogclient/functions/ogIsRepoLocked index aad48d2..5d20812 100755 --- a/ogclient/functions/ogIsRepoLocked +++ b/ogclient/functions/ogIsRepoLocked @@ -11,6 +11,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: ret = ogIsRepoLocked() +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogIsVirtualMachine b/ogclient/functions/ogIsVirtualMachine index 9592da3..8050ab1 100755 --- a/ogclient/functions/ogIsVirtualMachine +++ b/ogclient/functions/ogIsVirtualMachine @@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogIsVirtualMachine () +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogIsWritable b/ogclient/functions/ogIsWritable index 53e1314..1f41364 100755 --- a/ogclient/functions/ogIsWritable +++ b/ogclient/functions/ogIsWritable @@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogIsWritable (args.disk, args.par) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogLinuxBootParameters b/ogclient/functions/ogLinuxBootParameters index 6da5133..b029447 100755 --- a/ogclient/functions/ogLinuxBootParameters +++ b/ogclient/functions/ogLinuxBootParameters @@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogLinuxBootParameters (args.disk, args.par) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogListHardwareInfo b/ogclient/functions/ogListHardwareInfo index 2eaa493..6d75648 100755 --- a/ogclient/functions/ogListHardwareInfo +++ b/ogclient/functions/ogListHardwareInfo @@ -11,6 +11,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: ret = ogListHardwareInfo() +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogListLogicalPartitions b/ogclient/functions/ogListLogicalPartitions index c79a006..f166de9 100755 --- a/ogclient/functions/ogListLogicalPartitions +++ b/ogclient/functions/ogListLogicalPartitions @@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogListLogicalPartitions (args.disk) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogListPartitions b/ogclient/functions/ogListPartitions index ca0479b..fc52dcb 100755 --- a/ogclient/functions/ogListPartitions +++ b/ogclient/functions/ogListPartitions @@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogListPartitions (args.disk) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogListPrimaryPartitions b/ogclient/functions/ogListPrimaryPartitions index 045289f..b9edc0c 100755 --- a/ogclient/functions/ogListPrimaryPartitions +++ b/ogclient/functions/ogListPrimaryPartitions @@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogListPrimaryPartitions (args.disk) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogListRegistryKeys b/ogclient/functions/ogListRegistryKeys index c56d829..fb016b5 100755 --- a/ogclient/functions/ogListRegistryKeys +++ b/ogclient/functions/ogListRegistryKeys @@ -18,6 +18,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogListRegistryKeys (args.mntpt, args.hive, args.k) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogListRegistryValues b/ogclient/functions/ogListRegistryValues index b6dcc78..8976d0a 100755 --- a/ogclient/functions/ogListRegistryValues +++ b/ogclient/functions/ogListRegistryValues @@ -18,6 +18,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogListRegistryValues (args.mntpt, args.hive, args.k) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogListSoftware b/ogclient/functions/ogListSoftware index 75abb9f..ffe535d 100755 --- a/ogclient/functions/ogListSoftware +++ b/ogclient/functions/ogListSoftware @@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogListSoftware (args.disk, args.par) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogLock b/ogclient/functions/ogLock index 8bb795f..18a6612 100755 --- a/ogclient/functions/ogLock +++ b/ogclient/functions/ogLock @@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogLock (args.disk, args.par) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogLockDisk b/ogclient/functions/ogLockDisk index 1b1e640..c9edf68 100755 --- a/ogclient/functions/ogLockDisk +++ b/ogclient/functions/ogLockDisk @@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogLockDisk (args.disk) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogLockImage b/ogclient/functions/ogLockImage index 0c8f505..1b50d6e 100755 --- a/ogclient/functions/ogLockImage +++ b/ogclient/functions/ogLockImage @@ -24,6 +24,7 @@ if 2 == len (sys.argv): elif 3 == len (sys.argv): ret = ogLockImage (container=args.container, imgfile=args.file) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogLockPartition b/ogclient/functions/ogLockPartition index e83da43..965dde9 100755 --- a/ogclient/functions/ogLockPartition +++ b/ogclient/functions/ogLockPartition @@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogLockPartition (args.disk, args.par) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogMakeDir b/ogclient/functions/ogMakeDir index b12f1c1..f19a9f0 100755 --- a/ogclient/functions/ogMakeDir +++ b/ogclient/functions/ogMakeDir @@ -26,6 +26,7 @@ if 3 == len (sys.argv): elif 4 == len (sys.argv): ret = ogMakeDir (container=f'{args.disk} {args.par}', file=args.file) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogMcastReceiverFile b/ogclient/functions/ogMcastReceiverFile index 2b33ac2..b520cf9 100755 --- a/ogclient/functions/ogMcastReceiverFile +++ b/ogclient/functions/ogMcastReceiverFile @@ -33,6 +33,7 @@ elif 4 == len (sys.argv): elif 5 == len (sys.argv): ret = ogMcastReceiverFile (disk=args.disk, par=args.par, file=args.file, sess=args.sess) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogMcastReceiverPartition b/ogclient/functions/ogMcastReceiverPartition index 45a8763..69267cc 100755 --- a/ogclient/functions/ogMcastReceiverPartition +++ b/ogclient/functions/ogMcastReceiverPartition @@ -20,6 +20,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogMcastReceiverPartition (args.disk, args.par, args.sess, args.tool, args.compressor) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogMcastSendFile b/ogclient/functions/ogMcastSendFile index 7ed75ed..922da6c 100755 --- a/ogclient/functions/ogMcastSendFile +++ b/ogclient/functions/ogMcastSendFile @@ -40,6 +40,7 @@ elif 4 == len (sys.argv): elif 5 == len (sys.argv): ret = ogMcastSendFile (disk=args.disk, par=args.par, file=args.file, sess=args.sess) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogMcastSendPartition b/ogclient/functions/ogMcastSendPartition index 7c8ea6e..47b9869 100755 --- a/ogclient/functions/ogMcastSendPartition +++ b/ogclient/functions/ogMcastSendPartition @@ -20,6 +20,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogMcastSendPartition (args.disk, args.par, args.sess, args.tool, args.compressor) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogMcastSyntax b/ogclient/functions/ogMcastSyntax index a595498..047f107 100755 --- a/ogclient/functions/ogMcastSyntax +++ b/ogclient/functions/ogMcastSyntax @@ -28,6 +28,7 @@ elif 'SENDFILE' == sys.argv[1] or 'RECEIVERFILE' == sys.argv[1]: kwargs = { 'file': args.file } ret = ogMcastSyntax (args.op, args.sess, **kwargs) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogMount b/ogclient/functions/ogMount index 2a92f44..afb1123 100755 --- a/ogclient/functions/ogMount +++ b/ogclient/functions/ogMount @@ -29,6 +29,7 @@ if not done: args = parser.parse_args() ret = ogMountFs (args.disk, args.par) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogMountCache b/ogclient/functions/ogMountCache index 8dd7578..214018f 100755 --- a/ogclient/functions/ogMountCache +++ b/ogclient/functions/ogMountCache @@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogMountCache () +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogMountCdrom b/ogclient/functions/ogMountCdrom index 24db5f1..e59060e 100755 --- a/ogclient/functions/ogMountCdrom +++ b/ogclient/functions/ogMountCdrom @@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogMountCdrom () +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogMountFirstFs b/ogclient/functions/ogMountFirstFs index 61f324d..bcabde0 100755 --- a/ogclient/functions/ogMountFirstFs +++ b/ogclient/functions/ogMountFirstFs @@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogMountFirstFs (args.disk) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogMountFs b/ogclient/functions/ogMountFs index 2e2bdcf..acbe044 100755 --- a/ogclient/functions/ogMountFs +++ b/ogclient/functions/ogMountFs @@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogMountFs (args.disk, args.par) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogNvramActiveEntry b/ogclient/functions/ogNvramActiveEntry index 9eee20a..a915a7c 100755 --- a/ogclient/functions/ogNvramActiveEntry +++ b/ogclient/functions/ogNvramActiveEntry @@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogNvramActiveEntry (args.entry) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogNvramAddEntry b/ogclient/functions/ogNvramAddEntry index 1cffa53..b98c491 100755 --- a/ogclient/functions/ogNvramAddEntry +++ b/ogclient/functions/ogNvramAddEntry @@ -18,6 +18,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogNvramAddEntry (args.bootlbl, args.bootldr, args.nvram_set) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogNvramDeleteEntry b/ogclient/functions/ogNvramDeleteEntry index d8f7912..10aed92 100755 --- a/ogclient/functions/ogNvramDeleteEntry +++ b/ogclient/functions/ogNvramDeleteEntry @@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogNvramDeleteEntry (args.entry) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogNvramGetCurrent b/ogclient/functions/ogNvramGetCurrent index c2a393d..13b3002 100755 --- a/ogclient/functions/ogNvramGetCurrent +++ b/ogclient/functions/ogNvramGetCurrent @@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogNvramGetCurrent () +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogNvramGetNext b/ogclient/functions/ogNvramGetNext index 4cacb1d..f62f6e6 100755 --- a/ogclient/functions/ogNvramGetNext +++ b/ogclient/functions/ogNvramGetNext @@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogNvramGetNext () +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogNvramGetOrder b/ogclient/functions/ogNvramGetOrder index ef80387..ec22408 100755 --- a/ogclient/functions/ogNvramGetOrder +++ b/ogclient/functions/ogNvramGetOrder @@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogNvramGetOrder () +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogNvramGetTimeout b/ogclient/functions/ogNvramGetTimeout index 15d1e8d..eff49b1 100755 --- a/ogclient/functions/ogNvramGetTimeout +++ b/ogclient/functions/ogNvramGetTimeout @@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogNvramGetTimeout () +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogNvramInactiveEntry b/ogclient/functions/ogNvramInactiveEntry index 780213c..ff695a6 100755 --- a/ogclient/functions/ogNvramInactiveEntry +++ b/ogclient/functions/ogNvramInactiveEntry @@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogNvramInactiveEntry (args.entry) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogNvramList b/ogclient/functions/ogNvramList index d44c974..8589ab9 100755 --- a/ogclient/functions/ogNvramList +++ b/ogclient/functions/ogNvramList @@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogNvramList () +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogNvramPxeFirstEntry b/ogclient/functions/ogNvramPxeFirstEntry index 208328e..4eebdab 100755 --- a/ogclient/functions/ogNvramPxeFirstEntry +++ b/ogclient/functions/ogNvramPxeFirstEntry @@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogNvramPxeFirstEntry () +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogNvramSetNext b/ogclient/functions/ogNvramSetNext index 7c8ee3d..9928c9c 100755 --- a/ogclient/functions/ogNvramSetNext +++ b/ogclient/functions/ogNvramSetNext @@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogNvramSetNext (args.entry) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogNvramSetOrder b/ogclient/functions/ogNvramSetOrder index 13c22b4..fb92089 100755 --- a/ogclient/functions/ogNvramSetOrder +++ b/ogclient/functions/ogNvramSetOrder @@ -10,6 +10,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: sys.exit (0) ret = ogNvramSetOrder (sys.argv[1:]) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogNvramSetTimeout b/ogclient/functions/ogNvramSetTimeout index d54f89a..08057b4 100755 --- a/ogclient/functions/ogNvramSetTimeout +++ b/ogclient/functions/ogNvramSetTimeout @@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogNvramSetTimeout (args.t) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogRaiseError b/ogclient/functions/ogRaiseError index 15c94a6..505a608 100755 --- a/ogclient/functions/ogRaiseError +++ b/ogclient/functions/ogRaiseError @@ -29,6 +29,7 @@ except AttributeError: sys.exit (1) ret = ogRaiseError (logtypes, code, args.msg) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogReduceFs b/ogclient/functions/ogReduceFs index 999aa90..e576653 100755 --- a/ogclient/functions/ogReduceFs +++ b/ogclient/functions/ogReduceFs @@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogReduceFs (args.disk, args.par) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogRestoreEfiBootLoader b/ogclient/functions/ogRestoreEfiBootLoader index 7e72e37..f164720 100755 --- a/ogclient/functions/ogRestoreEfiBootLoader +++ b/ogclient/functions/ogRestoreEfiBootLoader @@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogRestoreEfiBootLoader (args.disk, args.par) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogRestoreImage b/ogclient/functions/ogRestoreImage index 57a461c..a33c899 100755 --- a/ogclient/functions/ogRestoreImage +++ b/ogclient/functions/ogRestoreImage @@ -19,6 +19,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogRestoreImage (args.repo, args.imgpath, args.disk, args.par) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogRestoreImageSyntax b/ogclient/functions/ogRestoreImageSyntax index 40d80ee..37ba9b4 100755 --- a/ogclient/functions/ogRestoreImageSyntax +++ b/ogclient/functions/ogRestoreImageSyntax @@ -19,6 +19,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogRestoreImageSyntax (args.imgfile, args.part, args.tool, args.level) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogSetLinuxName b/ogclient/functions/ogSetLinuxName index 0c66e0e..69c7da0 100755 --- a/ogclient/functions/ogSetLinuxName +++ b/ogclient/functions/ogSetLinuxName @@ -31,6 +31,7 @@ if 3 == len (sys.argv): elif 4 == len (sys.argv): ret = ogSetLinuxName (args.disk, args.par, args.hostname) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogSetPartitionActive b/ogclient/functions/ogSetPartitionActive index c8a97b8..86420d4 100755 --- a/ogclient/functions/ogSetPartitionActive +++ b/ogclient/functions/ogSetPartitionActive @@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogSetPartitionActive (args.disk, args.par) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogSetPartitionId b/ogclient/functions/ogSetPartitionId index 865051f..3a81a3e 100755 --- a/ogclient/functions/ogSetPartitionId +++ b/ogclient/functions/ogSetPartitionId @@ -18,6 +18,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogSetPartitionId (args.disk, args.par, args.id) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogSetPartitionSize b/ogclient/functions/ogSetPartitionSize index 84d17b9..00e6615 100755 --- a/ogclient/functions/ogSetPartitionSize +++ b/ogclient/functions/ogSetPartitionSize @@ -18,6 +18,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogSetPartitionSize (args.disk, args.par, args.size) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogSetPartitionType b/ogclient/functions/ogSetPartitionType index 875d0c4..a109b4d 100755 --- a/ogclient/functions/ogSetPartitionType +++ b/ogclient/functions/ogSetPartitionType @@ -18,6 +18,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogSetPartitionType (args.disk, args.par, args.type) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogSetRegistryValue b/ogclient/functions/ogSetRegistryValue index d13d47f..3fa3d5b 100755 --- a/ogclient/functions/ogSetRegistryValue +++ b/ogclient/functions/ogSetRegistryValue @@ -19,6 +19,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogSetRegistryValue (args.mntpt, args.hive, args.k, args.v) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogSetWindowsName b/ogclient/functions/ogSetWindowsName index d199c9d..eb7e00c 100755 --- a/ogclient/functions/ogSetWindowsName +++ b/ogclient/functions/ogSetWindowsName @@ -18,6 +18,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogSetWindowsName (args.disk, args.par, args.name) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogSetWinlogonUser b/ogclient/functions/ogSetWinlogonUser index 60c82e3..57c6a1c 100755 --- a/ogclient/functions/ogSetWinlogonUser +++ b/ogclient/functions/ogSetWinlogonUser @@ -18,6 +18,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogSetWinlogonUser (args.disk, args.par, args.username) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogTorrentStart b/ogclient/functions/ogTorrentStart index 778d512..63ad29f 100755 --- a/ogclient/functions/ogTorrentStart +++ b/ogclient/functions/ogTorrentStart @@ -33,6 +33,7 @@ elif 4 == len (sys.argv): elif 5 == len (sys.argv): ret = ogTorrentStart (disk=args.disk, par=args.par, torrentfile=args.torrentfile, torrentsess=args.torrentsess) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogTypeToId b/ogclient/functions/ogTypeToId index cce6665..01b656f 100755 --- a/ogclient/functions/ogTypeToId +++ b/ogclient/functions/ogTypeToId @@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogTypeToId (args.type, args.pttype) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogUcastReceiverPartition b/ogclient/functions/ogUcastReceiverPartition index 31fb177..f7f21cc 100755 --- a/ogclient/functions/ogUcastReceiverPartition +++ b/ogclient/functions/ogUcastReceiverPartition @@ -20,6 +20,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogUcastReceiverPartition (args.disk, args.par, args.sess, args.tool, args.level) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogUcastSendFile b/ogclient/functions/ogUcastSendFile index 498965a..c114c33 100755 --- a/ogclient/functions/ogUcastSendFile +++ b/ogclient/functions/ogUcastSendFile @@ -33,6 +33,7 @@ elif 4 == len (sys.argv): elif 5 == len (sys.argv): ret = ogUcastSendFile (disk=args.disk, par=args.par, file=args.file, sess=args.sess) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogUcastSendPartition b/ogclient/functions/ogUcastSendPartition index 8fba6dd..218335e 100755 --- a/ogclient/functions/ogUcastSendPartition +++ b/ogclient/functions/ogUcastSendPartition @@ -20,6 +20,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogUcastSendPartition (args.disk, args.par, args.sess, args.tool, args.level) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogUcastSyntax b/ogclient/functions/ogUcastSyntax index f360bc5..1b0c8ac 100755 --- a/ogclient/functions/ogUcastSyntax +++ b/ogclient/functions/ogUcastSyntax @@ -28,6 +28,7 @@ elif 'SENDFILE' == sys.argv[1] or 'RECEIVERFILE' == sys.argv[1]: kwargs = { 'file': args.file } ret = ogUcastSyntax (args.op, args.sess, **kwargs) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogUnhidePartition b/ogclient/functions/ogUnhidePartition index 539303e..b16c957 100755 --- a/ogclient/functions/ogUnhidePartition +++ b/ogclient/functions/ogUnhidePartition @@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogUnhidePartition (args.disk, args.par) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogUninstallLinuxClient b/ogclient/functions/ogUninstallLinuxClient index 0dfbe27..497e8e6 100755 --- a/ogclient/functions/ogUninstallLinuxClient +++ b/ogclient/functions/ogUninstallLinuxClient @@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogUninstallLinuxClient (args.disk, args.par) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogUninstallWindowsClient b/ogclient/functions/ogUninstallWindowsClient index 20ad443..53466a9 100755 --- a/ogclient/functions/ogUninstallWindowsClient +++ b/ogclient/functions/ogUninstallWindowsClient @@ -18,6 +18,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogUninstallWindowsClient (args.disk, args.par, args.cmdfile) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogUnlock b/ogclient/functions/ogUnlock index ac321a2..f9b4fb7 100755 --- a/ogclient/functions/ogUnlock +++ b/ogclient/functions/ogUnlock @@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogUnlock (args.disk, args.par) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogUnlockDisk b/ogclient/functions/ogUnlockDisk index 04ee6ed..a0ed5c4 100755 --- a/ogclient/functions/ogUnlockDisk +++ b/ogclient/functions/ogUnlockDisk @@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogUnlockDisk (args.disk) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogUnlockImage b/ogclient/functions/ogUnlockImage index c0f5196..3a720a3 100755 --- a/ogclient/functions/ogUnlockImage +++ b/ogclient/functions/ogUnlockImage @@ -24,6 +24,7 @@ if 2 == len (sys.argv): elif 3 == len (sys.argv): ret = ogUnlockImage (container=args.container, imgfile=args.file) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogUnlockPartition b/ogclient/functions/ogUnlockPartition index 134c072..2e0991b 100755 --- a/ogclient/functions/ogUnlockPartition +++ b/ogclient/functions/ogUnlockPartition @@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogUnlockPartition (args.disk, args.par) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogUnmount b/ogclient/functions/ogUnmount index 024294b..e149686 100755 --- a/ogclient/functions/ogUnmount +++ b/ogclient/functions/ogUnmount @@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogUnmount (args.disk, args.par) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogUnmountAll b/ogclient/functions/ogUnmountAll index 5b69eb7..77dc4f0 100755 --- a/ogclient/functions/ogUnmountAll +++ b/ogclient/functions/ogUnmountAll @@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogUnmountAll (args.disk) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogUnmountCache b/ogclient/functions/ogUnmountCache index 89a35fc..17525f9 100755 --- a/ogclient/functions/ogUnmountCache +++ b/ogclient/functions/ogUnmountCache @@ -16,6 +16,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogUnmountCache () +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogUnmountFs b/ogclient/functions/ogUnmountFs index 8c83bc0..0e83dec 100755 --- a/ogclient/functions/ogUnmountFs +++ b/ogclient/functions/ogUnmountFs @@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogUnmountFs (args.disk, args.par) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogUnsetDirtyBit b/ogclient/functions/ogUnsetDirtyBit index c7314f2..c724af1 100755 --- a/ogclient/functions/ogUnsetDirtyBit +++ b/ogclient/functions/ogUnsetDirtyBit @@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogUnsetDirtyBit (args.disk, args.par) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogUpdateCacheIsNecesary b/ogclient/functions/ogUpdateCacheIsNecesary index db05cec..8531d8f 100755 --- a/ogclient/functions/ogUpdateCacheIsNecesary +++ b/ogclient/functions/ogUpdateCacheIsNecesary @@ -18,6 +18,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogUpdateCacheIsNecesary (args.repo, args.file, args.proto) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogUpdatePartitionTable b/ogclient/functions/ogUpdatePartitionTable index 8200b2a..5eea922 100755 --- a/ogclient/functions/ogUpdatePartitionTable +++ b/ogclient/functions/ogUpdatePartitionTable @@ -7,6 +7,7 @@ from DiskLib import ogUpdatePartitionTable ret = ogUpdatePartitionTable() +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogWindowsBootParameters b/ogclient/functions/ogWindowsBootParameters index 3a410d9..9262662 100755 --- a/ogclient/functions/ogWindowsBootParameters +++ b/ogclient/functions/ogWindowsBootParameters @@ -17,6 +17,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogWindowsBootParameters (args.disk, args.par) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) diff --git a/ogclient/functions/ogWindowsRegisterPartition b/ogclient/functions/ogWindowsRegisterPartition index 34036bc..f94de41 100755 --- a/ogclient/functions/ogWindowsRegisterPartition +++ b/ogclient/functions/ogWindowsRegisterPartition @@ -20,6 +20,7 @@ if 2 == len (sys.argv) and 'help' == sys.argv[1]: args = parser.parse_args() ret = ogWindowsRegisterPartition (args.registered_disk, args.registered_par, args.registered_vol, args.disk, args.par) +if ret is None: sys.exit (1) if ret is not None: if ret == True: sys.exit (0) elif ret == False: sys.exit (1) From a1631a99548ac377a732102bc6ad8334256a43ab Mon Sep 17 00:00:00 2001 From: Natalia Serrano Date: Thu, 17 Jul 2025 16:31:46 +0200 Subject: [PATCH 2/2] refs #2438 update changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bfc0147..0e36503 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [0.30.1] - 2025-07-17 + +### Changed + +- Have wrappers fail if functions return None + ## [0.30.0] - 2025-07-17 ### Added