Attachment 7627 Details for Bug 41166 – Don't use default prefix when only server is given.

[patch] Don't use default prefix when only server is given.

file_41166.txt (text/plain), 1.43 KB, created by Philipp Hahn on 2016-04-27 16:29:27 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Philipp Hahn

Created: 2016-04-27 16:29:27 CEST

Size: 1.43 KB

patch

obsolete

>diff --git a/branches/ucs-4.1/ucs-4.1-1/base/univention-updater/modules/univention/updater/repo_url.py b/branches/ucs-4.1/ucs-4.1-1/base/univention-updater/modules/univention/updater/repo_url.py
>index 02168d6..e955ab7 100644
>--- a/branches/ucs-4.1/ucs-4.1-1/base/univention-updater/modules/univention/updater/repo_url.py
>+++ b/branches/ucs-4.1/ucs-4.1-1/base/univention-updater/modules/univention/updater/repo_url.py
>@@ -44,7 +44,7 @@ class UcsRepoUrl(object):
>     def __init__(self, ucr, prefix, default=None):
>         '''
>         >>> UcsRepoUrl({'_/server': 'hostname'}, '_').path
>-        '/'
>+        ''
>         >>> UcsRepoUrl({'_/server': 'hostname', '_/prefix': '/p'}, '_').path
>         '/p/'
>         >>> UcsRepoUrl({'_/server': 'hostname', '_/prefix': 'path'}, '_').path
>@@ -78,11 +78,12 @@ class UcsRepoUrl(object):
>                 self.hostname = server
>                 port = ucrv('port', 80)
>                 self.scheme = 'https' if port == 443 else 'http'
>+                prefix = ucrv('prefix', None)
>             else:
>                 self.hostname = default.hostname
>                 port = ucrv('port', default.port)
>                 self.scheme = default.scheme
>-            prefix = ucrv('prefix', default.path)
>+                prefix = ucrv('prefix', default.path)
>         self.port = int(port if port else 443 if self.scheme == 'https' else 80)
>         if prefix:
>             prefix = prefix.strip('/')

Actions: View | Diff

Attachments on bug 41166: 7627