@@ -293,19 +293,19 @@ var triggerDeleteCmd = &cobra.Command{
293293 // OR if the feed action is not present, there's no way to clean up the feed
294294 // "The requested resource does not exist"
295295 if strings .Contains (err .Error (), "could not find trigger" ) {
296- whisk .Debug (whisk .DbgWarn , "trigger feed is already deleted for trigger %s\n " , qualifiedName .GetEntityName ())
296+ whisk .Debug (whisk .DbgWarn , "trigger feed is already deleted for trigger %s\n " , qualifiedName .GetEntityName ())
297297 } else if strings .Contains (err .Error (), "The requested resource does not exist" ) {
298- whisk .Debug (whisk .DbgWarn , "trigger feed action '%s' does not exist\n " , fullFeedName )
298+ whisk .Debug (whisk .DbgWarn , "trigger feed action '%s' does not exist\n " , fullFeedName )
299299 } else {
300- errStr := wski18n .T ("Unable to delete trigger '{{.name}}': {{.err}}" ,
301- map [string ]interface {}{"name" : qualifiedName .GetEntityName (), "err" : err })
302-
303- if ! Flags .common .force {
304- werr := whisk .MakeWskErrorFromWskError (errors .New (errStr ), err , whisk .EXIT_CODE_ERR_GENERAL , whisk .DISPLAY_MSG , whisk .NO_DISPLAY_USAGE )
305- return werr
306- } else {
307- whisk .Debug (whisk .DbgInfo , "trigger delete is forced despite feed deletion failure\n " )
308- }
300+ errStr := wski18n .T ("Unable to delete trigger '{{.name}}': {{.err}}" ,
301+ map [string ]interface {}{"name" : qualifiedName .GetEntityName (), "err" : err })
302+
303+ if ! Flags .common .force {
304+ werr := whisk .MakeWskErrorFromWskError (errors .New (errStr ), err , whisk .EXIT_CODE_ERR_GENERAL , whisk .DISPLAY_MSG , whisk .NO_DISPLAY_USAGE )
305+ return werr
306+ } else {
307+ whisk .Debug (whisk .DbgInfo , "trigger delete is forced despite feed deletion failure\n " )
308+ }
309309 }
310310 }
311311
0 commit comments