View | Details | Raw Unified | Return to bug 41166
Collapse All | Expand All

(-)a/branches/ucs-4.1/ucs-4.1-1/base/univention-updater/modules/univention/updater/repo_url.py (-2 / +3 lines)
 Lines 44-50   class UcsRepoUrl(object): Link Here 
44
    def __init__(self, ucr, prefix, default=None):
44
    def __init__(self, ucr, prefix, default=None):
45
        '''
45
        '''
46
        >>> UcsRepoUrl({'_/server': 'hostname'}, '_').path
46
        >>> UcsRepoUrl({'_/server': 'hostname'}, '_').path
47
        '/'
47
        ''
48
        >>> UcsRepoUrl({'_/server': 'hostname', '_/prefix': '/p'}, '_').path
48
        >>> UcsRepoUrl({'_/server': 'hostname', '_/prefix': '/p'}, '_').path
49
        '/p/'
49
        '/p/'
50
        >>> UcsRepoUrl({'_/server': 'hostname', '_/prefix': 'path'}, '_').path
50
        >>> UcsRepoUrl({'_/server': 'hostname', '_/prefix': 'path'}, '_').path
 Lines 78-88   class UcsRepoUrl(object): Link Here 
78
                self.hostname = server
78
                self.hostname = server
79
                port = ucrv('port', 80)
79
                port = ucrv('port', 80)
80
                self.scheme = 'https' if port == 443 else 'http'
80
                self.scheme = 'https' if port == 443 else 'http'
81
                prefix = ucrv('prefix', None)
81
            else:
82
            else:
82
                self.hostname = default.hostname
83
                self.hostname = default.hostname
83
                port = ucrv('port', default.port)
84
                port = ucrv('port', default.port)
84
                self.scheme = default.scheme
85
                self.scheme = default.scheme
85
            prefix = ucrv('prefix', default.path)
86
                prefix = ucrv('prefix', default.path)
86
        self.port = int(port if port else 443 if self.scheme == 'https' else 80)
87
        self.port = int(port if port else 443 if self.scheme == 'https' else 80)
87
        if prefix:
88
        if prefix:
88
            prefix = prefix.strip('/')
89
            prefix = prefix.strip('/')

Return to bug 41166