Attachment 4709 Details for Bug 28750

[patch] Add --local to dpkg-divert for newer dpkg

28750_ucr-divert.diff (text/plain), 2.07 KB, created by Philipp Hahn on 2012-10-12 13:54 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Philipp Hahn

Created: 2012-10-12 13:54 CEST

Size: 2.07 KB

patch

obsolete

>diff --git a/branches/ucs-3.1/ucs/base/univention-config-registry/debian/changelog b/branches/ucs-3.1/ucs/base/univention-config-registry/debian/changelog
>index c6b2f3c..3cb1854 100644
>--- a/branches/ucs-3.1/ucs/base/univention-config-registry/debian/changelog
>+++ b/branches/ucs-3.1/ucs/base/univention-config-registry/debian/changelog
>@@ -1,3 +1,9 @@
>+univention-config-registry (8.0.4-9) unstable; urgency=low
>+
>+  * Force dpkg-divert --local (Bug #28750)
>+
>+ -- Philipp Hahn <hahn@univention.de>  Fri, 12 Oct 2012 13:53:15 +0200
>+
> univention-config-registry (8.0.4-8) unstable; urgency=low
> 
>   * Add support for search patterns (Bug #18254, Bug #28563)
>diff --git a/branches/ucs-3.1/ucs/base/univention-config-registry/python/univention/config_registry/handler.py b/branches/ucs-3.1/ucs/base/univention-config-registry/python/univention/config_registry/handler.py
>index 6ae86cf..040f270 100644
>--- a/branches/ucs-3.1/ucs/base/univention-config-registry/python/univention/config_registry/handler.py
>+++ b/branches/ucs-3.1/ucs/base/univention-config-registry/python/univention/config_registry/handler.py
>@@ -246,7 +246,7 @@ class ConfigHandlerDiverting(ConfigHandler):
> 	def install_divert(self):
> 		"""Prepare file for diversion."""
> 		deb = '%s.debian' % self.to_file
>-		self._call_silent('dpkg-divert', '--quiet', '--rename',
>+		self._call_silent('dpkg-divert', '--quiet', '--rename', '--local',
> 				'--divert', deb,
> 				'--add', self.to_file)
> 		# Make sure a valid file still exists
>@@ -261,7 +261,7 @@ class ConfigHandlerDiverting(ConfigHandler):
> 		except EnvironmentError:
> 			pass
> 		deb = '%s.debian' % self.to_file
>-		self._call_silent('dpkg-divert', '--quiet', '--rename',
>+		self._call_silent('dpkg-divert', '--quiet', '--rename', '--local',
> 				'--divert', deb,
> 				'--remove', self.to_file)
> 
>@@ -683,7 +683,7 @@ class ConfigHandlers:
> 						continue
> 					if ':' != diversion:  # local diversion
> 						continue
>-					assert path_from not in to_remove  # no dulicates
>+					assert path_from not in to_remove  # no duplicates
> 					try:
> 						handler = wanted.pop(path_from)
> 					except KeyError:

Actions: View | Diff

Attachments on bug 28750: 4709