summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-08-20 15:14:40 +0100
committerCarl Hetherington <cth@carlh.net>2013-08-20 15:14:40 +0100
commit498d22308d11aad0e9f7fdf763d8e3b782c0406f (patch)
tree70c1ec37901efb20ae551039722036537a337c6d
parentddbe8b0d11b319d5c7b08dde2a54931058073c7a (diff)
Fix crash with no args.work.
-rwxr-xr-xcdist8
1 files changed, 5 insertions, 3 deletions
diff --git a/cdist b/cdist
index 14c772c..0f3342b 100755
--- a/cdist
+++ b/cdist
@@ -561,6 +561,8 @@ parser.add_argument('--work', help='override default work directory')
args = parser.parse_args()
args.output = os.path.abspath(args.output)
+if args.work is not None:
+ args.work = os.path.abspath(args.work)
if args.project is None:
error('you must specify -p or --project')
@@ -571,7 +573,7 @@ if args.command == 'build':
if args.target is None:
error('you must specify -t or --target')
- target = target_factory(args.target, args.debug, os.path.abspath(args.work))
+ target = target_factory(args.target, args.debug, args.work)
project.checkout(target)
target.build_dependencies(project)
target.build(project)
@@ -582,7 +584,7 @@ elif args.command == 'package':
if args.target is None:
error('you must specify -t or --target')
- target = target_factory(args.target, args.debug, os.path.abspath(args.work))
+ target = target_factory(args.target, args.debug, args.work)
packages = target.package(project)
if hasattr(packages, 'strip') or (not hasattr(packages, '__getitem__') and not hasattr(packages, '__iter__')):
@@ -727,7 +729,7 @@ elif args.command == 'test':
if args.target is None:
error('you must specify -t or --target')
- target = target_factory(args.target, args.debug, os.path.abspath(args.work))
+ target = target_factory(args.target, args.debug, args.work)
project.read_cscript('cscript')
target.build(project)