From e5c650349b71bc7f204310dd3d1243ca8bed2f54 Mon Sep 17 00:00:00 2001 From: Michael Schwarz Date: Mon, 8 Sep 2014 21:24:36 +0200 Subject: [PATCH] setup.py: checkFreedom() should not need to check whether commands have been given on the command line. --- setup.py | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/setup.py b/setup.py index 5334d037..daa0b613 100755 --- a/setup.py +++ b/setup.py @@ -240,16 +240,15 @@ class Setup(): self.free = False def checkFreedom(): if self.free is None: - if (opts.opts['--version'] is None) and ((len(opts.files) != 1) or (opts.files[0] != 'version')): - print('') - print('You need to select your freedom, add --freedom=strict or --freedom=partial.') - print('') - print('--freedom=strict will install only ponies that are completely free.') - print('--freedom=partial will install all ponies, even if they are not free.') - print('') - print('') - exit(255) - + print() + print('You need to select your freedom, add --freedom=strict or --freedom=partial.') + print() + print('--freedom=strict will install only ponies that are completely free.') + print('--freedom=partial will install all ponies, even if they are not free.') + print() + print() + exit(255) + if (opts.opts['---DESTDIR'] is not None) and (opts.opts['--dest-dir'] is None): destdir = opts.opts['---DESTDIR'][0] if len(destdir) > 0: