forked from ungleich-public/cdist
		
	include object_name in warning
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
This commit is contained in:
		
					parent
					
						
							
								241f66a537
							
						
					
				
			
			
				commit
				
					
						e0f80f0103
					
				
			
		
					 6 changed files with 12 additions and 12 deletions
				
			
		| 
						 | 
					@ -32,11 +32,11 @@ state_should="$(cat "$__object/parameter/state")"
 | 
				
			||||||
# Correct pre 2.1 naming - FIXME in 2.1
 | 
					# Correct pre 2.1 naming - FIXME in 2.1
 | 
				
			||||||
case "$state_should" in
 | 
					case "$state_should" in
 | 
				
			||||||
    installed)
 | 
					    installed)
 | 
				
			||||||
        echo "WARNING: $state_should is deprecated and will be removed in cdist 2.1. Please change to present/absent." >&2
 | 
					        echo "WARNING:  ${__object_name}: $state_should is deprecated and will be removed in cdist 2.1. Please change to present/absent." >&2
 | 
				
			||||||
        state_should="present"
 | 
					        state_should="present"
 | 
				
			||||||
    ;;
 | 
					    ;;
 | 
				
			||||||
    removed)
 | 
					    removed)
 | 
				
			||||||
        echo "WARNING: $state_should is deprecated and will be removed in cdist 2.1. Please change to present/absent." >&2
 | 
					        echo "WARNING:  ${__object_name}: $state_should is deprecated and will be removed in cdist 2.1. Please change to present/absent." >&2
 | 
				
			||||||
        state_should="absent"
 | 
					        state_should="absent"
 | 
				
			||||||
    ;;
 | 
					    ;;
 | 
				
			||||||
esac
 | 
					esac
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -33,11 +33,11 @@ state_should="$(cat "$__object/parameter/state")"
 | 
				
			||||||
# Correct pre 2.1 naming - FIXME in 2.1
 | 
					# Correct pre 2.1 naming - FIXME in 2.1
 | 
				
			||||||
case "$state_should" in
 | 
					case "$state_should" in
 | 
				
			||||||
    installed)
 | 
					    installed)
 | 
				
			||||||
        echo "WARNING: $state_should is deprecated and will be removed in cdist 2.1. Please change to present/absent." >&2
 | 
					        echo "WARNING:  ${__object_name}: $state_should is deprecated and will be removed in cdist 2.1. Please change to present/absent." >&2
 | 
				
			||||||
        state_should="present"
 | 
					        state_should="present"
 | 
				
			||||||
    ;;
 | 
					    ;;
 | 
				
			||||||
    removed)
 | 
					    removed)
 | 
				
			||||||
        echo "WARNING: $state_should is deprecated and will be removed in cdist 2.1. Please change to present/absent." >&2
 | 
					        echo "WARNING:  ${__object_name}: $state_should is deprecated and will be removed in cdist 2.1. Please change to present/absent." >&2
 | 
				
			||||||
        state_should="absent"
 | 
					        state_should="absent"
 | 
				
			||||||
    ;;
 | 
					    ;;
 | 
				
			||||||
esac
 | 
					esac
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -36,11 +36,11 @@ fi
 | 
				
			||||||
state_should="$(cat "$__object/parameter/state")"
 | 
					state_should="$(cat "$__object/parameter/state")"
 | 
				
			||||||
case "$state_should" in
 | 
					case "$state_should" in
 | 
				
			||||||
    installed)
 | 
					    installed)
 | 
				
			||||||
        echo "WARNING: $state_should is deprecated and will be removed in cdist 2.1. Please change to present/absent." >&2       
 | 
					        echo "WARNING:  ${__object_name}: $state_should is deprecated and will be removed in cdist 2.1. Please change to present/absent." >&2       
 | 
				
			||||||
        state_should="present"
 | 
					        state_should="present"
 | 
				
			||||||
    ;;  
 | 
					    ;;  
 | 
				
			||||||
    removed)
 | 
					    removed)
 | 
				
			||||||
        echo "WARNING: $state_should is deprecated and will be removed in cdist 2.1. Please change to present/absent." >&2       
 | 
					        echo "WARNING:  ${__object_name}: $state_should is deprecated and will be removed in cdist 2.1. Please change to present/absent." >&2       
 | 
				
			||||||
        state_should="absent"
 | 
					        state_should="absent"
 | 
				
			||||||
    ;;  
 | 
					    ;;  
 | 
				
			||||||
esac
 | 
					esac
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -46,11 +46,11 @@ state_should="$(cat "$__object/parameter/state")"
 | 
				
			||||||
# Correct pre 2.1 naming - FIXME in 2.1
 | 
					# Correct pre 2.1 naming - FIXME in 2.1
 | 
				
			||||||
case "$state_should" in
 | 
					case "$state_should" in
 | 
				
			||||||
    installed)
 | 
					    installed)
 | 
				
			||||||
        echo "WARNING: $state_should is deprecated and will be removed in cdist 2.1. Please change to present/absent." >&2
 | 
					        echo "WARNING:  ${__object_name}: $state_should is deprecated and will be removed in cdist 2.1. Please change to present/absent." >&2
 | 
				
			||||||
        state_should="present"
 | 
					        state_should="present"
 | 
				
			||||||
    ;;
 | 
					    ;;
 | 
				
			||||||
    removed)
 | 
					    removed)
 | 
				
			||||||
        echo "WARNING: $state_should is deprecated and will be removed in cdist 2.1. Please change to present/absent." >&2
 | 
					        echo "WARNING:  ${__object_name}: $state_should is deprecated and will be removed in cdist 2.1. Please change to present/absent." >&2
 | 
				
			||||||
        state_should="absent"
 | 
					        state_should="absent"
 | 
				
			||||||
    ;;
 | 
					    ;;
 | 
				
			||||||
esac
 | 
					esac
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -31,11 +31,11 @@ state_should="$(cat "$__object/parameter/state")"
 | 
				
			||||||
# Correct pre 2.1 naming - FIXME in 2.1
 | 
					# Correct pre 2.1 naming - FIXME in 2.1
 | 
				
			||||||
case "$state_should" in
 | 
					case "$state_should" in
 | 
				
			||||||
    installed)
 | 
					    installed)
 | 
				
			||||||
        echo "WARNING: $state_should is deprecated and will be removed in cdist 2.1. Please change to present/absent." >&2
 | 
					        echo "WARNING:  ${__object_name}: $state_should is deprecated and will be removed in cdist 2.1. Please change to present/absent." >&2
 | 
				
			||||||
        state_should="present"
 | 
					        state_should="present"
 | 
				
			||||||
    ;;
 | 
					    ;;
 | 
				
			||||||
    removed)
 | 
					    removed)
 | 
				
			||||||
        echo "WARNING: $state_should is deprecated and will be removed in cdist 2.1. Please change to present/absent." >&2
 | 
					        echo "WARNING:  ${__object_name}: $state_should is deprecated and will be removed in cdist 2.1. Please change to present/absent." >&2
 | 
				
			||||||
        state_should="absent"
 | 
					        state_should="absent"
 | 
				
			||||||
    ;;
 | 
					    ;;
 | 
				
			||||||
esac
 | 
					esac
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -30,11 +30,11 @@ fi
 | 
				
			||||||
state_should="$(cat "$__object/parameter/state")"
 | 
					state_should="$(cat "$__object/parameter/state")"
 | 
				
			||||||
case "$state_should" in
 | 
					case "$state_should" in
 | 
				
			||||||
    installed)
 | 
					    installed)
 | 
				
			||||||
        echo "WARNING: $state_should is deprecated and will be removed in cdist 2.1. Please change to present/absent." >&2       
 | 
					        echo "WARNING:  ${__object_name}: $state_should is deprecated and will be removed in cdist 2.1. Please change to present/absent." >&2       
 | 
				
			||||||
        state_should="present"
 | 
					        state_should="present"
 | 
				
			||||||
    ;;
 | 
					    ;;
 | 
				
			||||||
    removed)
 | 
					    removed)
 | 
				
			||||||
        echo "WARNING: $state_should is deprecated and will be removed in cdist 2.1. Please change to present/absent." >&2       
 | 
					        echo "WARNING:  ${__object_name}: $state_should is deprecated and will be removed in cdist 2.1. Please change to present/absent." >&2       
 | 
				
			||||||
        state_should="absent"
 | 
					        state_should="absent"
 | 
				
			||||||
    ;;
 | 
					    ;;
 | 
				
			||||||
esac
 | 
					esac
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue