Merge branch 'git-version' of https://github.com/evax/cdist
Conflicts: lib/cdist/__init__.py Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
This commit is contained in:
		
				commit
				
					
						9b809ce9a2
					
				
			
		
					 1 changed files with 11 additions and 3 deletions
				
			
		| 
						 | 
					@ -19,6 +19,16 @@
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import os
 | 
				
			||||||
 | 
					import subprocess
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					try:
 | 
				
			||||||
 | 
					    with open(os.devnull, 'w') as devnull:
 | 
				
			||||||
 | 
					        here = os.path.dirname(os.path.realpath(__file__))
 | 
				
			||||||
 | 
					        VERSION = subprocess.check_output(
 | 
				
			||||||
 | 
					                    'cd "%s" && git describe' % here,
 | 
				
			||||||
 | 
					                    stderr=devnull, shell=True).decode('utf-8')
 | 
				
			||||||
 | 
					except:
 | 
				
			||||||
    VERSION     = "2.0.10"
 | 
					    VERSION     = "2.0.10"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
BANNER = """
 | 
					BANNER = """
 | 
				
			||||||
| 
						 | 
					@ -38,8 +48,6 @@ BANNER = """
 | 
				
			||||||
DOT_CDIST   = ".cdist"
 | 
					DOT_CDIST   = ".cdist"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import os
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
class Error(Exception):
 | 
					class Error(Exception):
 | 
				
			||||||
    """Base exception class for this project"""
 | 
					    """Base exception class for this project"""
 | 
				
			||||||
    pass
 | 
					    pass
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue