fixed formatting

Signed-off-by: dmitriy kalinin <[email protected]>
bingosummer · Sep 11, 2014 · c545856 · c545856
1 parent 2799aff
commit c545856
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/platform/disk/root_device_partitioner.go b/platform/disk/root_device_partitioner.go
@@ -58,7 +58,7 @@ func (p rootDevicePartitioner) Partition(devicePath string, partitions []Partiti
 			len(existingPartitions),
 			existingPartitions,
 		)
-		return bosherr.New("Found %d unexpected partitions on `%s'",  len(existingPartitions)-1, devicePath)
+		return bosherr.New("Found %d unexpected partitions on `%s'", len(existingPartitions)-1, devicePath)
 	}
 
 	for index, partition := range partitions {

diff --git a/platform/linux_platform.go b/platform/linux_platform.go
@@ -383,6 +383,7 @@ func (p linux) SetupEphemeralDiskWithPath(realPath string) error {
 	}
 
 	var swapPartitionPath, dataPartitionPath string
+
 	if realPath == "" {
 		if !p.options.CreatePartitionIfNoEphemeralDisk {
 			p.logger.Info(logTag, "No ephemeral disk found, using root partition as ephemeral disk")
@@ -395,9 +396,9 @@ func (p linux) SetupEphemeralDiskWithPath(realPath string) error {
 			if isInsufficentSpaceError {
 				p.logger.Warn(logTag, "No partitions created on root device, using root partition as ephemeral disk", err)
 				return nil
-			} else {
-				return bosherr.WrapError(err, "Creating ephemeral partitions on root device")
 			}
+
+			return bosherr.WrapError(err, "Creating ephemeral partitions on root device")
 		}
 	} else {
 		swapPartitionPath, dataPartitionPath, err = p.partitionEphemeralDisk(realPath)

diff --git a/platform/linux_platform_test.go b/platform/linux_platform_test.go
@@ -40,7 +40,7 @@ var _ = Describe("LinuxPlatform", func() {
 		vitalsService      boshvitals.Service
 		netManager         *fakenet.FakeManager
 		options            LinuxOptions
-		logger 			   boshlog.Logger
+		logger             boshlog.Logger
 	)
 
 	BeforeEach(func() {
@@ -616,13 +616,13 @@ fake-base-path/data/sys/log/*.log fake-base-path/data/sys/log/*/*.log fake-base-
 								Expect(partitioner.PartitionPartitions).To(ContainElement(
 									boshdisk.Partition{
 										SizeInBytes: memSizeInBytes,
-										Type: boshdisk.PartitionTypeSwap,
+										Type:        boshdisk.PartitionTypeSwap,
 									}),
 								)
 								Expect(partitioner.PartitionPartitions).To(ContainElement(
 									boshdisk.Partition{
 										SizeInBytes: diskSizeInBytes - memSizeInBytes,
-										Type: boshdisk.PartitionTypeLinux,
+										Type:        boshdisk.PartitionTypeLinux,
 									}),
 								)
 							})
@@ -639,13 +639,13 @@ fake-base-path/data/sys/log/*.log fake-base-path/data/sys/log/*/*.log fake-base-
 								Expect(partitioner.PartitionPartitions).To(ContainElement(
 									boshdisk.Partition{
 										SizeInBytes: diskSizeInBytes / 2,
-										Type: boshdisk.PartitionTypeSwap,
+										Type:        boshdisk.PartitionTypeSwap,
 									}),
 								)
 								Expect(partitioner.PartitionPartitions).To(ContainElement(
 									boshdisk.Partition{
 										SizeInBytes: diskSizeInBytes / 2,
-										Type: boshdisk.PartitionTypeLinux,
+										Type:        boshdisk.PartitionTypeLinux,
 									}),
 								)
 							})