Attachment 3654 Details for Bug 24102

[patch] Remove 2nd mapping of univentionInventoryNumber

24102_inventory_duplicate.diff (text/plain), 4.70 KB, created by Philipp Hahn on 2011-10-19 08:31 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Philipp Hahn

Created: 2011-10-19 08:31 CEST

Size: 4.70 KB

patch

obsolete

>commit e2f0b2bdf0f92ac100ab5cb61b99ab4f2c1ac0c5
>Author: Philipp Hahn <hahn@univention.de>
>Date:   Wed Oct 19 07:29:57 2011 +0200
>
>    Bug #24102: Remove duplicate mapping of univentionInventoryNumber
>    
>    The mapping for inventoryNumber to univentionInventoryNumber is
>    registered twice.
>    
>    Remove one mapping.
>
>diff --git a/branches/ucs-2.4/ucs/management/univention-directory-manager-modules/debian/changelog b/branches/ucs-2.4/ucs/management/univention-directory-manager-modules/debian/changelog
>index d01700c..a3f038b 100644
>--- a/branches/ucs-2.4/ucs/management/univention-directory-manager-modules/debian/changelog
>+++ b/branches/ucs-2.4/ucs/management/univention-directory-manager-modules/debian/changelog
>@@ -1,3 +1,9 @@
>+univention-directory-manager-modules (6.0.219-1) unstable; urgency=low
>+
>+  * Remove duplicate mapping of univentionInventoryNumber (Bug #24102)
>+
>+ -- Philipp Hahn <hahn@univention.de>  Wed, 19 Oct 2011 07:23:22 +0200
>+
> univention-directory-manager-modules (6.0.218-1) unstable; urgency=low
> 
>   * fixed univention-sync-memberuid (Bug #23281)
>diff --git a/branches/ucs-2.4/ucs/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/domaincontroller_backup.py b/branches/ucs-2.4/ucs/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/domaincontroller_backup.py
>index 9c0b40d..a102847 100644
>--- a/branches/ucs-2.4/ucs/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/domaincontroller_backup.py
>+++ b/branches/ucs-2.4/ucs/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/domaincontroller_backup.py
>@@ -351,7 +351,6 @@ mapping.register('inventoryNumber', 'univentionInventoryNumber')
> mapping.register('serverRole', 'univentionServerRole')
> mapping.register('mac', 'macAddress' )
> mapping.register('ip', 'aRecord' )
>-mapping.register('inventoryNumber', 'univentionInventoryNumber')
> mapping.register('reinstall', 'univentionServerReinstall', None, univention.admin.mapping.ListToString)
> mapping.register('instprofile', 'univentionServerInstallationProfile', None, univention.admin.mapping.ListToString)
> mapping.register('reinstalloption', 'univentionServerInstallationOption', None, univention.admin.mapping.ListToString)
>diff --git a/branches/ucs-2.4/ucs/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/domaincontroller_master.py b/branches/ucs-2.4/ucs/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/domaincontroller_master.py
>index 77c3a25..5d022df 100644
>--- a/branches/ucs-2.4/ucs/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/domaincontroller_master.py
>+++ b/branches/ucs-2.4/ucs/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/domaincontroller_master.py
>@@ -351,7 +351,6 @@ mapping.register('inventoryNumber', 'univentionInventoryNumber')
> mapping.register('serverRole', 'univentionServerRole')
> mapping.register('mac', 'macAddress' )
> mapping.register('ip', 'aRecord' )
>-mapping.register('inventoryNumber', 'univentionInventoryNumber')
> mapping.register('reinstall', 'univentionServerReinstall', None, univention.admin.mapping.ListToString)
> mapping.register('instprofile', 'univentionServerInstallationProfile', None, univention.admin.mapping.ListToString)
> mapping.register('reinstalloption', 'univentionServerInstallationOption', None, univention.admin.mapping.ListToString)
>diff --git a/branches/ucs-2.4/ucs/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/domaincontroller_slave.py b/branches/ucs-2.4/ucs/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/domaincontroller_slave.py
>index 4927246..3bf4e1f 100644
>--- a/branches/ucs-2.4/ucs/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/domaincontroller_slave.py
>+++ b/branches/ucs-2.4/ucs/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/domaincontroller_slave.py
>@@ -351,7 +351,6 @@ mapping.register('inventoryNumber', 'univentionInventoryNumber')
> mapping.register('serverRole', 'univentionServerRole')
> mapping.register('mac', 'macAddress' )
> mapping.register('ip', 'aRecord' )
>-mapping.register('inventoryNumber', 'univentionInventoryNumber')
> mapping.register('reinstall', 'univentionServerReinstall', None, univention.admin.mapping.ListToString)
> mapping.register('instprofile', 'univentionServerInstallationProfile', None, univention.admin.mapping.ListToString)
> mapping.register('reinstalloption', 'univentionServerInstallationOption', None, univention.admin.mapping.ListToString)

Actions: View | Diff

Attachments on bug 24102: 3654