comparison: scripts/x
scripts/x
- branch
- trunk
- changeset 10
- f0acfe12a0e2
- parent 9
- 920417b8acc9
- child 11
- a2ca41a85243
equal
deleted
inserted
replaced
| 9:920417b8acc9 | 10:f0acfe12a0e2 |
|---|---|
| 352 return str(error) | 352 return str(error) |
| 353 | 353 |
| 354 def recurse(self): | 354 def recurse(self): |
| 355 if not self.options.recursive: | 355 if not self.options.recursive: |
| 356 return | 356 return |
| 357 archive_path = os.path.split(self.current_filename)[0] | |
| 358 for filename in self.current_extractor.included_archives: | 357 for filename in self.current_extractor.included_archives: |
| 359 tail_path, basename = os.path.split(filename) | 358 tail_path, basename = os.path.split(filename) |
| 360 directory = os.path.join(self.current_directory, archive_path, | 359 directory = os.path.join(self.current_directory, |
| 361 self.current_handler.directory, tail_path) | 360 self.current_handler.directory, tail_path) |
| 362 self.archives.setdefault(directory, []).append(basename) | 361 self.archives.setdefault(directory, []).append(basename) |
| 363 | 362 |
| 364 def report(self, function, *args): | 363 def report(self, function, *args): |
| 365 error = function(*args) | 364 error = function(*args) |
