More fixes for importing Lorax.
This commit is contained in:
		
							parent
							
								
									3377bc22e4
								
							
						
					
					
						commit
						291bf4492a
					
				| @ -25,7 +25,7 @@ import getopt | |||||||
| import os | import os | ||||||
| import sys | import sys | ||||||
| 
 | 
 | ||||||
| import pylorax | from pylorax import Lorax | ||||||
| 
 | 
 | ||||||
| def usage(prog): | def usage(prog): | ||||||
|     print("Usage: %s -v VERSION -p PRODUCT -r RELEASE -o PATH REPO\n" % (prog,)) |     print("Usage: %s -v VERSION -p PRODUCT -r RELEASE -o PATH REPO\n" % (prog,)) | ||||||
| @ -91,7 +91,8 @@ if __name__ == "__main__": | |||||||
|         elif o in ('-C', '--cleanup'): |         elif o in ('-C', '--cleanup'): | ||||||
|             cleanup = True |             cleanup = True | ||||||
|         elif o in ('-V'): |         elif o in ('-V'): | ||||||
|             pylorax.show_version(prog) |             # XXX: need to fix this | ||||||
|  |             #pylorax.show_version(prog) | ||||||
|             sys.exit(0) |             sys.exit(0) | ||||||
| 
 | 
 | ||||||
|     if version is None or product is None or release is None or output is None: |     if version is None or product is None or release is None or output is None: | ||||||
| @ -102,7 +103,7 @@ if __name__ == "__main__": | |||||||
|         sys.stderr.write("ERROR: Missing repo to use for image generation.\n") |         sys.stderr.write("ERROR: Missing repo to use for image generation.\n") | ||||||
|         sys.exit(1) |         sys.exit(1) | ||||||
| 
 | 
 | ||||||
|     lorax = pylorax.Lorax(repos=args, output=output, mirrorlist=mirrorlist) |     lorax = Lorax(repos=args, output=output, mirrorlist=mirrorlist) | ||||||
| 
 | 
 | ||||||
|     if confdir is not None: |     if confdir is not None: | ||||||
|         lorax.conf['confdir'] = confdir |         lorax.conf['confdir'] = confdir | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user