/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to olive/backend/update.py

  • Committer: Szilveszter Farkas (Phanatic)
  • Date: 2006-08-29 18:14:00 UTC
  • mto: (0.14.1 main) (93.1.1 win32.bialix)
  • mto: This revision was merged to the branch mainline in revision 83.
  • Revision ID: Szilveszter.Farkas@gmail.com-20060829181400-cb20292c55f917f4
ChangeLog updated; bundle related bug fixed.

2006-08-29  Szilveszter Farkas <Szilveszter.Farkas@gmail.com>

    * olive/backend/update.py: fixed a bug if bundles not available under bzr
      0.8.2 (Fixed: #57761)
    * Merge from Stéphane's branch.
    * po/olive-gtk.pot: regenerated
    * po/hu.po: msginit'ed

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/backend/update.py
99
99
    
100
100
    :return: number of revisions pulled
101
101
    """
 
102
    nobundle = False
 
103
    
102
104
    from bzrlib.branch import Branch
103
 
    from bzrlib.bundle import read_bundle_from_url
104
 
    from bzrlib.bundle.apply_bundle import install_bundle
 
105
    try:
 
106
        from bzrlib.bundle import read_bundle_from_url
 
107
        from bzrlib.bundle.apply_bundle import install_bundle
 
108
    except ImportError:
 
109
        # no bundle support
 
110
        nobundle = True
105
111
    
106
112
    try:
107
113
        tree_to = WorkingTree.open_containing(branch)[0]
116
122
        raise NotBranchError(location)
117
123
 
118
124
    reader = None
119
 
    if location is not None:
 
125
    if location is not None and not nobundle:
120
126
        try:
121
127
            reader = read_bundle_from_url(location)
122
128
        except errors.NotABundle:
129
135
        else:
130
136
            location = stored_loc
131
137
 
132
 
    if reader is not None:
 
138
    if reader is not None and not nobundle:
133
139
        install_bundle(branch_to.repository, reader)
134
140
        branch_from = branch_to
135
141
    else: