|
Lines 246-252
class ConfigHandlerDiverting(ConfigHandler):
|
Link Here
|
|---|
|
|---|
| 246 |
def install_divert(self): |
246 |
def install_divert(self): |
| 247 |
"""Prepare file for diversion.""" |
247 |
"""Prepare file for diversion.""" |
| 248 |
deb = '%s.debian' % self.to_file |
248 |
deb = '%s.debian' % self.to_file |
| 249 |
self._call_silent('dpkg-divert', '--quiet', '--rename', |
249 |
self._call_silent('dpkg-divert', '--quiet', '--rename', '--local', |
| 250 |
'--divert', deb, |
250 |
'--divert', deb, |
| 251 |
'--add', self.to_file) |
251 |
'--add', self.to_file) |
| 252 |
# Make sure a valid file still exists |
252 |
# Make sure a valid file still exists |
|
Lines 261-267
class ConfigHandlerDiverting(ConfigHandler):
|
Link Here
|
|---|
|
|---|
| 261 |
except EnvironmentError: |
261 |
except EnvironmentError: |
| 262 |
pass |
262 |
pass |
| 263 |
deb = '%s.debian' % self.to_file |
263 |
deb = '%s.debian' % self.to_file |
| 264 |
self._call_silent('dpkg-divert', '--quiet', '--rename', |
264 |
self._call_silent('dpkg-divert', '--quiet', '--rename', '--local', |
| 265 |
'--divert', deb, |
265 |
'--divert', deb, |
| 266 |
'--remove', self.to_file) |
266 |
'--remove', self.to_file) |
| 267 |
|
267 |
|
|
Lines 683-689
class ConfigHandlers:
|
Link Here
|
|---|
|
|---|
| 683 |
continue |
683 |
continue |
| 684 |
if ':' != diversion: # local diversion |
684 |
if ':' != diversion: # local diversion |
| 685 |
continue |
685 |
continue |
| 686 |
assert path_from not in to_remove # no dulicates |
686 |
assert path_from not in to_remove # no duplicates |
| 687 |
try: |
687 |
try: |
| 688 |
handler = wanted.pop(path_from) |
688 |
handler = wanted.pop(path_from) |
| 689 |
except KeyError: |
689 |
except KeyError: |