Browse Source

Merge pull request #12941 from runcom/unused-return-error

Remove unused error return
Alexander Morozov 10 years ago
parent
commit
ec534042aa
1 changed files with 2 additions and 6 deletions
  1. 2 6
      daemon/execdriver/native/create.go

+ 2 - 6
daemon/execdriver/native/create.go

@@ -65,9 +65,7 @@ func (d *driver) createContainer(c *execdriver.Command) (*configs.Config, error)
 		return nil, err
 	}
 
-	if err := d.setupLabels(container, c); err != nil {
-		return nil, err
-	}
+	d.setupLabels(container, c)
 	d.setupRlimits(container, c)
 	return container, nil
 }
@@ -254,9 +252,7 @@ func (d *driver) setupMounts(container *configs.Config, c *execdriver.Command) e
 	return nil
 }
 
-func (d *driver) setupLabels(container *configs.Config, c *execdriver.Command) error {
+func (d *driver) setupLabels(container *configs.Config, c *execdriver.Command) {
 	container.ProcessLabel = c.ProcessLabel
 	container.MountLabel = c.MountLabel
-
-	return nil
 }