mirror of
				https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu
				synced 2025-10-31 08:34:04 +00:00 
			
		
		
		
	Merge branch 'master' into p-u
This commit is contained in:
		
						commit
						ca97a1830c
					
				| @ -185,7 +185,6 @@ import re | |||||||
| import sys | import sys | ||||||
| import string | import string | ||||||
| import time | import time | ||||||
| import copy |  | ||||||
| import optparse | import optparse | ||||||
| import operator | import operator | ||||||
| import urllib | import urllib | ||||||
| @ -345,7 +344,7 @@ class Britney: | |||||||
|          |          | ||||||
|         # integrity checks |         # integrity checks | ||||||
|         if self.options.nuninst_cache and self.options.print_uninst: |         if self.options.nuninst_cache and self.options.print_uninst: | ||||||
|             exit.__log("nuninst_cache and print_uninst are mutually exclusive!", type="E") |             self.__log("nuninst_cache and print_uninst are mutually exclusive!", type="E") | ||||||
|             sys.exit(1) |             sys.exit(1) | ||||||
|         # if the configuration file exists, than read it and set the additional options |         # if the configuration file exists, than read it and set the additional options | ||||||
|         elif not os.path.isfile(self.options.config): |         elif not os.path.isfile(self.options.config): | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user