Attachment 5181 Details for Bug 31123

[patch] Remove dev work-around

dh-umb-modules.diff (text/plain), 1.63 KB, created by Philipp Hahn on 2013-04-22 13:43 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Philipp Hahn

Created: 2013-04-22 13:43 CEST

Size: 1.63 KB

patch

obsolete

>diff --git a/branches/ucs-3.1/ucs-3.1-1/management/univention-management-console/dev/dh-umc-module-build b/branches/ucs-3.1/ucs-3.1-1/management/univention-management-console/dev/dh-umc-module-build
>index b386874..3fea868 100755
>--- a/branches/ucs-3.1/ucs-3.1-1/management/univention-management-console/dev/dh-umc-module-build
>+++ b/branches/ucs-3.1/ucs-3.1-1/management/univention-management-console/dev/dh-umc-module-build
>@@ -36,13 +36,7 @@ import sys
> from optparse import OptionParser
> 
> import univention.debhelper as dh_ucs
>-
>-try:
>-	sys.path.insert( 0, './dev' )
>-	import dh_umc
>-except BaseException, e:
>-	print 'warning:', str( e )
>-	import univention.dh_umc as dh_umc
>+import univention.dh_umc as dh_umc
> 
> """Helps installing UMC modules. It parses a RFC 822 file called
> $(package).umc-modules and installs the specified components of a module
>diff --git a/branches/ucs-3.1/ucs-3.1-1/management/univention-management-console/dev/dh-umc-module-install b/branches/ucs-3.1/ucs-3.1-1/management/univention-management-console/dev/dh-umc-module-install
>index 879266e..74c5b8a 100755
>--- a/branches/ucs-3.1/ucs-3.1-1/management/univention-management-console/dev/dh-umc-module-install
>+++ b/branches/ucs-3.1/ucs-3.1-1/management/univention-management-console/dev/dh-umc-module-install
>@@ -36,11 +36,7 @@ import sys
> from optparse import OptionParser
> 
> import univention.debhelper as dh_ucs
>-try:
>-	sys.path.insert( 0, './dev' )
>-	import dh_umc
>-except:
>-	import univention.dh_umc as dh_umc
>+import univention.dh_umc as dh_umc
> 
> """Helps installing UMC modules. It parses a RFC 822 file called
> $(package).umc-modules and installs the specified components of a module

Actions: View | Diff

Attachments on bug 31123: 5181