--- setup.py 2011-03-22 19:00:03.000000000 +0100 +++ setup.py 2011-06-10 19:28:41.798000241 +0200 @@ -224,41 +224,7 @@ os.unlink(os.path.join('staging', 'ufw-init')) os.unlink(os.path.join('staging', 'ufw-init-functions')) -iptables_exe = '' -iptables_dir = '' - -for e in ['iptables']: - for dir in ['/sbin', '/bin', '/usr/sbin', '/usr/bin', '/usr/local/sbin', \ - '/usr/local/bin']: - if e == "iptables": - if os.path.exists(os.path.join(dir, e)): - iptables_dir = dir - iptables_exe = os.path.join(iptables_dir, "iptables") - print "Found '%s'" % iptables_exe - else: - continue - - if iptables_exe != "": - break - - -if iptables_exe == '': - print >> sys.stderr, "ERROR: could not find required binary 'iptables'" - sys.exit(1) - -for e in ['ip6tables', 'iptables-restore', 'ip6tables-restore']: - if not os.path.exists(os.path.join(iptables_dir, e)): - print >> sys.stderr, "ERROR: could not find required binary '%s'" % (e) - sys.exit(1) - -(rc, out) = cmd([iptables_exe, '-V']) -if rc != 0: - raise OSError(errno.ENOENT, "Could not find version for '%s'" % \ - (iptables_exe)) -version = re.sub('^v', '', re.split('\s', out)[1]) -print "Found '%s' version '%s'" % (iptables_exe, version) -if version < "1.4": - print >> sys.stderr, "WARN: version '%s' has limited IPv6 support. See README for details." % (version) +iptables_dir = '/sbin' setup (name='ufw', version=ufw_version,