1
=== modified file 'common/Duplicity.vala'
2
--- common/Duplicity.vala	2011-10-20 16:31:27 +0000
3
+++ common/Duplicity.vala	2011-11-02 13:57:26 +0000
4
@@ -103,6 +103,7 @@
5
103
  static File slash_root;
103
  static File slash_root;
6
104
  static File slash_home;
104
  static File slash_home;
7
105
  static File slash_home_me;
105
  static File slash_home_me;
8
106
  static Regex gpg_regex;
9
106
  
107
  
10
107
  bool has_checked_contents = false;
108
  bool has_checked_contents = false;
11
108
  bool has_non_home_contents = false;
109
  bool has_non_home_contents = false;
12
@@ -143,6 +144,15 @@
13
143
      slash_home = File.new_for_path("/home");
144
      slash_home = File.new_for_path("/home");
14
144
      slash_home_me = File.new_for_path(Environment.get_home_dir());
145
      slash_home_me = File.new_for_path(Environment.get_home_dir());
15
145
    }
146
    }
16
147
17
148
    if (gpg_regex == null) {
18
149
      try {
19
150
        gpg_regex = new Regex(".*\\[.*\\.(g|gpg)'.*]$");
20
151
      }
21
152
      catch (Error e) {
22
153
        error("%s\n", e.message); // this is a programmer error, so use error()
23
154
      }
24
155
    }
25
146
  }
156
  }
26
147
157
27
148
  ~Duplicity() {
158
  ~Duplicity() {
28
@@ -1108,16 +1118,13 @@
29
1108
    if (firstline.length > 1) {
1118
    if (firstline.length > 1) {
30
1109
      switch (int.parse(firstline[1])) {
1119
      switch (int.parse(firstline[1])) {
31
1110
      case DEBUG_GENERIC:
1120
      case DEBUG_GENERIC:
32
1111
        // In non-modern versions of duplicity, this list of files is the only
33
1112
        // way to tell whether the backup is encrypted or not.  This message
34
1113
        // was not translated in duplicity before switching to a better method
35
1114
        // of detecting, so we can safely check for it.
36
1115
        if (mode == Operation.Mode.STATUS &&
1121
        if (mode == Operation.Mode.STATUS &&
37
1116
            !DuplicityInfo.get_default().reports_encryption &&
1122
            !DuplicityInfo.get_default().reports_encryption &&
42
1117
            !detected_encryption &&
1123
            !detected_encryption) {
43
1118
            text.has_prefix("Extracting backup chains from list of files:")) {
1124
          if (gpg_regex != null && gpg_regex.match(text)) {
44
1119
          detected_encryption = true;
1125
            detected_encryption = true;
45
1120
          existing_encrypted = text.contains(".gpg'") || text.contains(".g'");
1126
            existing_encrypted = true;
46
1127
          }
47
1121
        }
1128
        }
48
1122
        break;
1129
        break;
49
1123
      }
1130
      }
50
1124
1131
51
=== modified file 'preferences/Preferences.vala'
52
--- preferences/Preferences.vala	2011-10-19 15:32:50 +0000
53
+++ preferences/Preferences.vala	2011-11-02 13:57:26 +0000
54
@@ -360,6 +360,10 @@
55
360
    notebook.append_page(table, null);
360
    notebook.append_page(table, null);
56
361
    notebook.set_tab_label_text(table, _("Schedule"));
361
    notebook.set_tab_label_text(table, _("Schedule"));
57
362
362
58
363
    var accessible = notebook.get_accessible();
59
364
    if (accessible != null)
60
365
      accessible.set_name(_("Categories"));
61
366
62
363
    notebook.expand = true;
367
    notebook.expand = true;
63
364
    settings_page.add(notebook);
368
    settings_page.add(notebook);
64
365
369
65
366
370
66
=== modified file 'tests/backup/encrypt'
67
--- tests/backup/encrypt	2011-07-25 15:08:11 +0000
68
+++ tests/backup/encrypt	2011-11-02 13:57:26 +0000
69
@@ -20,7 +20,8 @@
70
20
# Test whether we correctly ask or not for the encryption password
20
# Test whether we correctly ask or not for the encryption password
71
21
21
72
22
import sys
22
import sys
74
23
sys.path.insert(0, sys.path[0]+'/..')
23
scriptdir=sys.path[0]
75
24
sys.path.insert(0, scriptdir+'/..')
76
24
import base
25
import base
77
25
import os
26
import os
78
26
import ldtp
27
import ldtp
79
@@ -34,6 +35,7 @@
80
34
35
81
35
def encrypt():
36
def encrypt():
82
36
  base.setup()
37
  base.setup()
83
38
  os.environ['PATH'] = os.path.join(scriptdir, 'encrypt-bin') + ":" + os.environ['PATH']
84
37
  base.backup_simple(backend='file', encrypt=True, includes=['data/simple'])
39
  base.backup_simple(backend='file', encrypt=True, includes=['data/simple'])
85
38
  basenum = len(os.listdir(base.get_temp_name('local')))
40
  basenum = len(os.listdir(base.get_temp_name('local')))
86
39
  base.backup_simple(encrypt=True, finish=False, includes=['/usr/bin'])
41
  base.backup_simple(encrypt=True, finish=False, includes=['/usr/bin'])
87
40
42
88
=== added directory 'tests/backup/encrypt-bin'
89
=== added file 'tests/backup/encrypt-bin/duplicity'
90
--- tests/backup/encrypt-bin/duplicity	1970-01-01 00:00:00 +0000
91
+++ tests/backup/encrypt-bin/duplicity	2011-11-02 13:57:26 +0000
92
@@ -0,0 +1,37 @@
93
1
#!/usr/bin/env python
94
2
# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 2; coding: utf-8 -*-
95
3
#
96
4
# This file is part of Déjà Dup.
97
5
# For copyright information, see AUTHORS.
98
6
#
99
7
# Déjà Dup is free software; you can redistribute it and/or modify
100
8
# it under the terms of the GNU General Public License as published by
101
9
# the Free Software Foundation; either version 3 of the License, or
102
10
# (at your option) any later version.
103
11
#
104
12
# Déjà Dup is distributed in the hope that it will be useful, but
105
13
# WITHOUT ANY WARRANTY; without even the implied warranty of
106
14
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
107
15
# General Public License for more details.
108
16
#
109
17
# You should have received a copy of the GNU General Public License
110
18
# along with Déjà Dup.  If not, see <http://www.gnu.org/licenses/>.
111
19
112
20
# This file acts like a duplicity wrapper.
113
21
# It transforms any instances of "Extracting backup chains from list of files:"
114
22
# to "Translation:" (to help catch things like bug
115
23
# https://bugs.launchpad.net/deja-dup/+bug/877631)
116
24
117
25
import os
118
26
import sys
119
27
import subprocess
120
28
121
29
# Drop the PATH override that pointed to this script
122
30
os.environ['PATH'] = os.environ['PATH'].split(':', 1)[-1]
123
31
124
32
extra_args = []
125
33
126
34
p1 = subprocess.Popen(['duplicity'] + sys.argv[1:], stdout=subprocess.PIPE)
127
35
p2 = subprocess.Popen(["sed", "-s", "s/Extracting backup chains from list of files:/Translation:/g"], stdin=p1.stdout)
128
36
p1.stdout.close()  # Allow p1 to receive a SIGPIPE if p2 exits.
129
37
p2.wait()
130
0
38
131
=== modified file 'tests/base.py'
132
--- tests/base.py	2011-08-30 18:57:19 +0000
133
+++ tests/base.py	2011-11-02 13:57:26 +0000
134
@@ -420,7 +420,7 @@
135
420
420
136
421
def walk_prefs(backend, dest, includes, excludes):
421
def walk_prefs(backend, dest, includes, excludes):
137
422
  if backend == 'file':
422
  if backend == 'file':
139
423
    ldtp.selectrow('frmBackup', 'tblCategories', 'Storage')
423
    ldtp.selecttab('frmBackup', 'ptlCategories', 'Storage')
140
424
424
141
425
    if dest is None:
425
    if dest is None:
142
426
      dest = get_temp_name('local')
426
      dest = get_temp_name('local')
143
@@ -432,7 +432,7 @@
144
432
    ldtp.settextvalue('frmBackup', 'txt0', dest) # FIXME txt0 is bad name
432
    ldtp.settextvalue('frmBackup', 'txt0', dest) # FIXME txt0 is bad name
145
433
    ldtp.wait(1) # without this, sometimes ldtp moves so fast, deja-dup doesn't notice dest
433
    ldtp.wait(1) # without this, sometimes ldtp moves so fast, deja-dup doesn't notice dest
146
434
434
148
435
  ldtp.selectrow('frmBackup', 'tblCategories', 'Folders')
435
  ldtp.selecttab('frmBackup', 'ptlCategories', 'Folders')
149
436
  if includes is not None:
436
  if includes is not None:
150
437
    set_file_list('frmBackup', 'tblIncludeList', 'btnIncludeListAdd', 'btnIncludeListRemove', includes)
437
    set_file_list('frmBackup', 'tblIncludeList', 'btnIncludeListAdd', 'btnIncludeListRemove', includes)
151
438
  if excludes is not None:
438
  if excludes is not None:
152
@@ -455,12 +455,13 @@
153
455
455
154
456
  if guivisible('frmBackup', 'btnJustshowmybackupsettings'):
456
  if guivisible('frmBackup', 'btnJustshowmybackupsettings'):
155
457
    ldtp.click('frmBackup', 'btnJustshowmybackupsettings')
457
    ldtp.click('frmBackup', 'btnJustshowmybackupsettings')
156
458
    remap('frmBackup')
157
458
459
158
459
  if backend is not None or includes is not None or excludes is not None:
460
  if backend is not None or includes is not None or excludes is not None:
159
460
    walk_prefs(backend=backend, dest=dest, includes=includes,
461
    walk_prefs(backend=backend, dest=dest, includes=includes,
160
461
               excludes=excludes)
462
               excludes=excludes)
161
462
463
163
463
  ldtp.selectrow('frmBackup', 'tblCategories', 'Overview')
464
  ldtp.selecttab('frmBackup', 'ptlCategories', 'Overview')
164
464
  ldtp.click('frmBackup', 'btnBackUpNow')
465
  ldtp.click('frmBackup', 'btnBackUpNow')
165
465
  waitforgui('frmBackUp')
466
  waitforgui('frmBackUp')
166
466
467
167
@@ -483,7 +484,7 @@
168
483
  if guivisible('frmBackup', 'btnIwanttorestorefilesfromapreviousbackup…'):
484
  if guivisible('frmBackup', 'btnIwanttorestorefilesfromapreviousbackup…'):
169
484
    ldtp.click('frmBackup', 'btnIwanttorestorefilesfromapreviousbackup…')
485
    ldtp.click('frmBackup', 'btnIwanttorestorefilesfromapreviousbackup…')
170
485
  else:
486
  else:
172
486
    ldtp.selectrow('frmBackup', 'tblCategories', 'Overview')
487
    ldtp.selecttab('frmBackup', 'ptlCategories', 'Overview')
173
487
    ldtp.click('frmBackup', 'btnRestore…')
488
    ldtp.click('frmBackup', 'btnRestore…')
174
488
489
175
489
  waitforgui('frmRestore')
490
  waitforgui('frmRestore')
176
@@ -492,7 +493,7 @@
177
492
    walk_restore_prefs('frmRestore', backend, dest)  
493
    walk_restore_prefs('frmRestore', backend, dest)  
178
493
  ldtp.click('frmRestore', 'btnForward')
494
  ldtp.click('frmRestore', 'btnForward')
179
494
495
181
495
  wait_for_finish('frmRestore', 'lblRestorefromWhen?', 200)
496
  wait_for_finish('frmRestore', 'lblRestoreFromWhen?', 200)
182
496
  if date:
497
  if date:
183
497
    ldtp.comboselect('frmRestore', 'cboDate', date)
498
    ldtp.comboselect('frmRestore', 'cboDate', date)
184
498
  ldtp.click('frmRestore', 'btnForward')
499
  ldtp.click('frmRestore', 'btnForward')
185
@@ -528,7 +529,7 @@
186
528
    walk_restore_prefs('frmRestore', backend=backend, dest=dest)
529
    walk_restore_prefs('frmRestore', backend=backend, dest=dest)
187
529
  ldtp.click('frmRestore', 'btnForward')
530
  ldtp.click('frmRestore', 'btnForward')
188
530
531
190
531
  wait_for_finish('frmRestore', 'lblRestorefromWhen?', 200)
532
  wait_for_finish('frmRestore', 'lblRestoreFromWhen?', 200)
191
532
  if date:
533
  if date:
192
533
    ldtp.comboselect('frmRestore', 'cboDate', date)
534
    ldtp.comboselect('frmRestore', 'cboDate', date)
193
534
  ldtp.click('frmRestore', 'btnForward')
535
  ldtp.click('frmRestore', 'btnForward')
Reviewer	Review Type	Date Requested	Status
Ken VanDine		2011-11-02	Approve on 2011-11-03
Review via email: mp+81021@code.launchpad.net