~therp-nl/anybox.recipe.openerp/jbaudoux-relative_paths_resolve_conflict

« back to all changes in this revision

Viewing changes to anybox/recipe/openerp/vcs/bzr.py

[MRG] Update with target branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
213
213
 
214
214
            self.update_conf()
215
215
 
 
216
            init_opt = self.options.get('bzr-init')
216
217
            if self.is_fixed_revision(revision):
 
218
                if (offline and init_opt == 'lightweight-checkout'):
 
219
                    logger.warning("Offline mode, no update for lightweight "
 
220
                                   "checkout at %s on revision %r",
 
221
                                   self.target_dir, revision)
 
222
                    return
217
223
                try:
218
224
                    self._update(revision)
219
225
                    return
225
231
                logger.info("Offline mode, no pull for revision %r", revision)
226
232
            else:
227
233
                self._pull()
228
 
            if not (offline and
229
 
                    self.options.get('bzr-init') == 'stacked-branch'):
 
234
 
 
235
            if not (offline and init_opt in ('stacked-branch',
 
236
                                             'lightweight-checkout')):
230
237
                self._update(revision)
231
238
 
232
239
    def _branch(self, revision):