/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/add.py

  • Committer: Jelmer Vernooij
  • Date: 2006-10-01 01:56:17 UTC
  • mfrom: (0.8.98 merge)
  • Revision ID: jelmer@samba.org-20061001015617-9827cc403415cbf0
[merge] more changes from Szilveszter

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/add.py
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
import os
18
 
import sys
19
18
 
20
19
try:
21
20
    import pygtk
68
67
                             _('Please select a file from the list,\nor choose the other option.'))
69
68
                return
70
69
            
71
 
            if self.wtpath == "":
72
 
                fullpath = self.wt.abspath(filename)
73
 
            else:
74
 
                fullpath = self.wt.abspath(self.wtpath + os.sep + filename)
 
70
            fullpath = self.wt.abspath(os.path.join(self.wtpath, filename))
75
71
            
76
72
            try:
77
73
                bzrlib.add.smart_add([fullpath])
81
77
                return
82
78
        elif radio_unknown.get_active():
83
79
            # Add unknown files recursively
 
80
            fullpath = self.wt.abspath(self.wtpath)
 
81
            
84
82
            try:
85
 
                bzrlib.add.smart_add([self.wtpath], True)
 
83
                bzrlib.add.smart_add([fullpath], True)
86
84
            except errors.NotBranchError:
87
85
                error_dialog(_('Directory is not a branch'),
88
86
                             _('You can perform this action only in a branch.'))