equal
deleted
inserted
replaced
174 except OSError, err: |
174 except OSError, err: |
175 if err.errno != errno.EEXIST: |
175 if err.errno != errno.EEXIST: |
176 raise |
176 raise |
177 |
177 |
178 if options.jobs < 1: |
178 if options.jobs < 1: |
179 parser.error('-j/--jobs must be positive') |
179 parser.error('--jobs must be positive') |
180 if options.interactive and options.jobs > 1: |
180 if options.interactive and options.jobs > 1: |
181 print '(--interactive overrides --jobs)' |
181 print '(--interactive overrides --jobs)' |
182 options.jobs = 1 |
182 options.jobs = 1 |
183 if options.py3k_warnings: |
183 if options.py3k_warnings: |
184 if sys.version_info[:2] < (2, 6) or sys.version_info[:2] >= (3, 0): |
184 if sys.version_info[:2] < (2, 6) or sys.version_info[:2] >= (3, 0): |
185 parser.error('Py3k warnings switch can only be used on Python 2.6+') |
185 parser.error('--py3k-warnings can only be used on Python 2.6+') |
186 |
186 |
187 return (options, args) |
187 return (options, args) |
188 |
188 |
189 def rename(src, dst): |
189 def rename(src, dst): |
190 """Like os.rename(), trade atomicity and opened files friendliness |
190 """Like os.rename(), trade atomicity and opened files friendliness |