← Back to branch summary

~ubuntu-branches/ubuntu/karmic/loggerhead/karmic-security

« back to all changes in this revision

Viewing changes to loggerhead/apps/config.py

  • Committer: Bazaar Package Importer
  • Author(s): James Westby, Roland Mas, Jelmer Vernooij, James Westby
  • Date: 2009-08-26 13:18:03 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20090826131803-0ce1fhaetci8b0c5
Tags: 1.17-0ubuntu1
http://bugs.debian.org/511286
http://bugs.debian.org/507000
[ Roland Mas ]
* Use the YUI library provided by libjs-yui. (Closes: #511286)

[ Jelmer Vernooij ]
* Use my debian.org address in Uploaders field.
* Add ${misc:Depends} to please lintian.
* Suggest recent version of paste, which doesn't expose internal port
  numbers in links. (Closes: #507000)
* Bump standards version to 3.8.1.

[ James Westby ]
* New upstream release.
* Drop get-orig-source rule in favour of debian/watch.
* Add python-pkg-resources and python-paste to Build-Depends,
  python-pkg-resources to Depends and python-simplejson to
  Recommends due to dependency changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
loggerhead/apps/config.py
108
108
                friendly_name = history.get_config().get_nickname()
109
109
                if friendly_name is None:
110
110
                    friendly_name = view_name
 
111
            branch_url = self._get_branch_url(view, view_config, view_name)
 
112
            description = self._get_description(view, view_config, history)
111
113
            self.view_data_by_name[view_name] = {
112
114
                'branch_path': folder,
113
 
                'args': (view_name, view_config, self.graph_cache),
114
 
                'description': self._get_description(view,
115
 
                                                     view_config,
116
 
                                                     history),
117
 
                '_src_folder': folder,
118
 
                '_view_config': view_config,
 
115
                'config': view_config,
 
116
                'description': description,
119
117
                'friendly_name': friendly_name,
 
118
                'graph_cache': self.graph_cache,
120
119
                'name': view_name,
 
120
                'served_url': branch_url,
121
121
                }
122
 
            branch_url = self._get_branch_url(view, view_config, view_name)
123
 
            if branch_url is not None:
124
 
                self.view_data_by_name[view_name]['branch_url'] = branch_url
125
122
            self.view_names.append(view_name)
126
123
        finally:
127
124
            b.unlock()
132
129
            return None
133
130
        view_data = view_data.copy()
134
131
        branch_path = view_data.pop('branch_path')
135
 
        args = view_data.pop('args')
 
132
        description = view_data.pop('description')
 
133
        name = view_data.pop('name')
136
134
        b = bzrlib.branch.Branch.open(branch_path)
137
135
        b.lock_read()
138
 
        view = BranchWSGIApp(b, *args)
139
 
        for k in view_data:
140
 
            setattr(view, k, view_data[k])
 
136
        view = BranchWSGIApp(b, **view_data)
 
137
        view.description = description
 
138
        view.name = name
141
139
        return view
142
140
 
143
141
    def call(self, environ, start_response):