toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #25023 from cpuguy83/25022_fix_label_panic

Browse Source 
fix panic on --label-add
Upstream-commit: afac3361dc66b0fd0c3910f89d0d7e8156b37e24
Component: engine
This commit is contained in:
Tibor Vass
2016-07-25 18:13:15 -07:00
committed by GitHub
parent d759fd7b51 d2f3f931f0
commit b94b8fd3fd
3 changed files with 43 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/engine/api/client/service/update.go
View File

@ -250,7 +250,7 @@ func updatePlacement(flags *pflag.FlagSet, placement *swarm.Placement) {
func updateLabels(flags *pflag.FlagSet, field *map[string]string) {
if flags.Changed(flagLabelAdd) {
if field == nil {
if *field == nil {
*field = map[string]string{}
}
@ -260,7 +260,7 @@ func updateLabels(flags *pflag.FlagSet, field *map[string]string) {
}
}
if field != nil && flags.Changed(flagLabelRemove) {
if *field != nil && flags.Changed(flagLabelRemove) {
toRemove := flags.Lookup(flagLabelRemove).Value.(*opts.ListOpts).GetAll()
for _, label := range toRemove {
delete(*field, label)