Fix bug caused by erroneous API usage.

openmediavault · Mar 26, 2017 · 8a2ff57 · 8a2ff57
1 parent d07899a
commit 8a2ff57
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 6 deletions.
diff --git a/deb/openmediavault-usbbackup/debian/changelog b/deb/openmediavault-usbbackup/debian/changelog
@@ -1,3 +1,9 @@
+openmediavault-usbbackup (3.2.17) stable; urgency=low
+
+  * Fix bug caused by erroneous API usage.
+
+ -- Volker Theile <volker.theile@openmediavault.org>  Sun, 26 Mar 2017 23:43:35 +0200
+
 openmediavault-usbbackup (3.2.16) stable; urgency=low
 
   * Various improvements.

diff --git a/deb/openmediavault-usbbackup/debian/control b/deb/openmediavault-usbbackup/debian/control
@@ -9,7 +9,7 @@ Homepage: http://www.openmediavault.org
 
 Package: openmediavault-usbbackup
 Architecture: all
-Depends: rsync, openmediavault (>= 3.0.67)
+Depends: rsync, openmediavault (>= 3.0.68)
 Priority: optional
 Description: OpenMediaVault USB/eSATA backup plugin
  Automatically synchronise a shared folder to an USB/eSATA device and vice

diff --git a/deb/openmediavault-usbbackup/usr/share/openmediavault/engined/rpc/usbbackup.inc b/deb/openmediavault-usbbackup/usr/share/openmediavault/engined/rpc/usbbackup.inc
@@ -76,7 +76,8 @@ class OMVRpcServiceUsbBackup extends \OMV\Rpc\ServiceAbstract {
 			// Get the filesystem implementation.
 			$fs = $fsb->getImpl($objectv['devicefile']);
 			// Get the parent storage device containing the filesystem.
-			if (FALSE === ($parentDeviceFile = $fs->getParentDeviceFile()))
+			$parentDeviceFile = $fs->getParentDeviceFile();
+			if (TRUE === is_null($parentDeviceFile))
 				continue;
 			\OMV\System\Storage\StorageDevice::assertStorageDeviceExists(
 			  $parentDeviceFile);

diff --git a/deb/openmediavault/usr/share/openmediavault/engined/rpc/filesystemmgmt.inc b/deb/openmediavault/usr/share/openmediavault/engined/rpc/filesystemmgmt.inc
@@ -798,7 +798,8 @@ class OMVRpcServiceFileSystemMgmt extends \OMV\Rpc\ServiceAbstract {
 		}
 		// Get the parent storage device containing the filesystem, e.g.
 		// /dev/sdb or /dev/cciss/c0d0.
-		if (FALSE === ($parentDeviceFile = $fs->getParentDeviceFile())) {
+		$parentDeviceFile = $fs->getParentDeviceFile();
+		if (TRUE === is_null($parentDeviceFile)) {
 			throw new \OMV\Exception(
 			  "Failed to get parent storage device file from '%s'.",
 			  $fs->getDeviceFile());

diff --git a/deb/openmediavault/usr/share/php/openmediavault/system/filesystem/filesystem.inc b/deb/openmediavault/usr/share/php/openmediavault/system/filesystem/filesystem.inc
@@ -417,7 +417,7 @@ class Filesystem extends \OMV\System\BlockDevice implements IFilesystem,
 	 * \li /dev/sdb1 => /dev/sdb
 	 * \li /dev/cciss/c0d0p2 => /dev/cciss/c0d0
 	 * </ul>
-	 * @return The device file of the underlying storage device or FALSE
+	 * @return The device file of the underlying storage device or NULL
 	 *   on failure.
 	 */
 	public function getParentDeviceFile() {
@@ -437,7 +437,7 @@ class Filesystem extends \OMV\System\BlockDevice implements IFilesystem,
 		// - /dev/loop0 => /dev/loop0
 		$mngr = \OMV\System\Storage\Backend\Manager::getInstance();
 		if (NULL === ($backend = $mngr->getBackend($deviceFile)))
-			return FALSE;
+			return NULL;
 		$parentDeviceFile = $backend->baseDeviceFile($deviceFile);
 		if (FALSE === is_devicefile_by_id($parentDeviceFile)) {
 			// Get the storage device file of the filesystems parent device.

diff --git a/deb/openmediavault/usr/share/php/openmediavault/system/filesystem/ifilesystem.inc b/deb/openmediavault/usr/share/php/openmediavault/system/filesystem/ifilesystem.inc
@@ -127,7 +127,8 @@ interface IFilesystem {
 	 * \li /dev/sdb1 => /dev/sdb
 	 * \li /dev/cciss/c0d0p2 => /dev/cciss/c0d0
 	 * </ul>
-	 * @return The device file of the underlying storage device.
+	 * @return The device file of the underlying storage device or NULL
+	 *   on failure.
 	 */
 	public function getParentDeviceFile();