Commit 69077b99 authored by Michael Terry's avatar Michael Terry

require duplicity 0.6.14 for its corruption fixes

parent c23e0a3e
Déjà Dup 19.91 (GNOME 3.1.91)
-----------------------------
Packaging:
• Require Duplicity >= 0.6.14, for its data corruption fixes
Déjà Dup 19.90 (GNOME 3.1.90)
-----------------------------
Polish:
......
......@@ -77,12 +77,6 @@ class U1Checker : Checker
{
PythonChecker pyu1;
construct {
if (!DuplicityInfo.get_default().has_u1) {
available = false;
complete = true;
return;
}
try {
var proxy = BackendU1.get_creds_proxy();
if (proxy.get_name_owner() == null) {
......
......@@ -326,13 +326,10 @@ public class Duplicity : Object
}
public void stop() {
// just abruptly stop, without a cleanup, duplicity will resume
was_stopped = true;
if (!DuplicityInfo.get_default().can_resume)
cancel(); // might as well be clean about it
else { // just abruptly stop, without a cleanup
mode = Operation.Mode.INVALID;
cancel_inst();
}
mode = Operation.Mode.INVALID;
cancel_inst();
}
public void pause(string? reason)
......
......@@ -25,11 +25,8 @@ public class DuplicityInfo : Object
{
public static const int REQUIRED_MAJOR = 0;
public static const int REQUIRED_MINOR = 6;
public static const int REQUIRED_MICRO = 8;
public static const int REQUIRED_MICRO = 14;
public bool can_resume {get; private set; default = false; }
public bool use_gpg_options {get; private set; default = false; }
public bool has_u1 {get; private set; default = false;}
public bool reports_encryption {get; private set; default = false;}
static DuplicityInfo info = null;
......@@ -79,12 +76,6 @@ public class DuplicityInfo : Object
return false;
}
if (equals_version(0, 6, 8))
use_gpg_options = true; // workaround a duplicity bug
if (meets_version(0, 6, 13))
can_resume = true; // had it since 0.6.0, but had data corruption bugs
if (meets_version(0, 6, 14))
has_u1 = true;
if (meets_version(0, 6, 15))
reports_encryption = true;
......
......@@ -66,9 +66,7 @@ public class DuplicityInstance : Object
// It's possible for --use-agent to be on by default (as it is in Ubuntu).
// But we never want an agent, and it's a possible point of failure (e.g.
// bug 681002), so just make sure it's disabled. Adding this meets the
// requirements of use_gpg_options, so we no longer bother checking if that
// DuplicityInfo flag is active.
// bug 681002), so just make sure it's disabled.
argv.append("--gpg-options=--no-use-agent");
// Cache signature files
......
......@@ -118,7 +118,6 @@ public abstract class Operation : Object
done(false, false);
return;
}
yield set_session_inhibited(true);
yield DejaDup.Network.ensure_status();
......@@ -252,7 +251,6 @@ public abstract class Operation : Object
{
finished = true;
yield set_session_inhibited(false);
unclaim_bus();
done(success, cancelled);
......@@ -287,47 +285,6 @@ public abstract class Operation : Object
{
Bus.unown_name(bus_id);
}
uint inhibit_cookie = 0;
async void set_session_inhibited(bool inhibit)
{
// Don't inhibit if we can resume safely
if (DuplicityInfo.get_default().can_resume)
return;
try {
// FIXME: use async version when I figure out the syntax
DBusProxy obj = new DBusProxy.for_bus_sync(BusType.SESSION,
DBusProxyFlags.NONE, null,
"org.gnome.SessionManager",
"/org/gnome/SessionManager",
"org.gnome.SessionManager",
null);
if (inhibit) {
if (inhibit_cookie > 0)
return; // already inhibited
var cookie_val = yield obj.call("Inhibit",
// logout and suspend, but not switch user
new Variant("(susu)",
Config.PACKAGE,
xid,
mode_to_string(dup.mode),
(uint) (1 | 4)),
DBusCallFlags.NONE, -1, null);
cookie_val.get("(u)", out inhibit_cookie);
}
else if (inhibit_cookie > 0) {
yield obj.call("Uninhibit", new Variant("(u)", inhibit_cookie),
DBusCallFlags.NONE, -1, null);
inhibit_cookie = 0;
}
}
catch (Error e) {
// Ignore. We may not be allowed to inhibit or it may not be running
}
}
}
} // end namespace
......
......@@ -36,7 +36,6 @@ public abstract class Assistant : Gtk.Window
public signal void forward();
public signal void backward();
public string apply_text {get; set; default = Gtk.Stock.APPLY;}
public bool resume_supported {get; set; default = false;}
public bool last_op_was_back {get; private set; default = false;}
public enum Type {
......@@ -312,7 +311,7 @@ public abstract class Assistant : Gtk.Window
break;
case Type.PROGRESS:
show_cancel = true;
show_resume = resume_supported;
show_resume = true;
break;
case Type.FINISH:
show_close = true;
......
......@@ -30,7 +30,6 @@ public class AssistantBackup : AssistantOperation
{
title = C_("back up is verb", "Back Up");
apply_text = C_("back up is verb", "_Back Up");
resume_supported = DejaDup.DuplicityInfo.get_default().can_resume;
resumed.connect(do_resume);
}
......
......@@ -91,12 +91,7 @@ public abstract class StatusIcon : Object
protected Notify.Notification note;
construct {
if (DejaDup.DuplicityInfo.get_default().can_resume)
later_label = _("_Resume Later");
else if (automatic)
later_label = _("_Delay Backup");
else
later_label = _("_Cancel Backup");
later_label = _("_Resume Later");
skip_label = _("_Skip Backup");
op.action_desc_changed.connect(set_action_desc);
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: mike@mterry.name\n"
"POT-Creation-Date: 2011-08-18 15:35-0400\n"
"POT-Creation-Date: 2011-08-23 10:14-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -20,8 +20,8 @@ msgstr ""
#: ../data/deja-dup.desktop.in.h:1 ../data/deja-dup-ccpanel.desktop.in.h:2
#: ../data/deja-dup-preferences.desktop.in.in.h:2 ../deja-dup/Prompt.vala:93
#: ../deja-dup/Prompt.vala:127 ../deja-dup/StatusIcon.vala:131
#: ../deja-dup/StatusIcon.vala:254 ../monitor/monitor.vala:115
#: ../deja-dup/Prompt.vala:127 ../deja-dup/StatusIcon.vala:126
#: ../deja-dup/StatusIcon.vala:249 ../monitor/monitor.vala:115
#: ../preferences/preferences-main.vala:51
#: ../preferences/preferences-main.vala:63
msgid "Backup"
......@@ -352,7 +352,7 @@ msgid "Backup will begin when %s becomes connected."
msgstr ""
#: ../common/BackendFile.vala:131 ../common/BackendRackspace.vala:49
#: ../common/BackendS3.vala:59 ../common/BackendU1.vala:146
#: ../common/BackendS3.vala:59 ../common/BackendU1.vala:140
msgid "Backup will begin when a network connection becomes available."
msgstr ""
......@@ -445,21 +445,21 @@ msgstr ""
msgid "_Remember secret access key"
msgstr ""
#: ../common/BackendU1.vala:162 ../widgets/ConfigLocation.vala:183
#: ../common/BackendU1.vala:156 ../widgets/ConfigLocation.vala:183
msgid "Ubuntu One"
msgstr ""
#. Translators: %s is a folder.
#: ../common/BackendU1.vala:165
#: ../common/BackendU1.vala:159
#, c-format
msgid "%s on Ubuntu One"
msgstr ""
#: ../common/BackendU1.vala:220
#: ../common/BackendU1.vala:214
msgid "Connect to Ubuntu One"
msgstr ""
#: ../common/BackendU1.vala:221
#: ../common/BackendU1.vala:215
msgid "Sign into Ubuntu One…"
msgstr ""
......@@ -477,33 +477,33 @@ msgstr ""
msgid "Trash"
msgstr ""
#: ../common/DuplicityInfo.vala:115
#: ../common/DuplicityInfo.vala:106
msgid "Could not run duplicity"
msgstr ""
#: ../common/DuplicityInfo.vala:120
#: ../common/DuplicityInfo.vala:111
msgid ""
"Could not understand duplicity version.\n"
"\n"
msgstr ""
#: ../common/DuplicityInfo.vala:122
#: ../common/DuplicityInfo.vala:113
#, c-format
msgid ""
"Could not understand duplicity version ‘%s’.\n"
"\n"
msgstr ""
#: ../common/DuplicityInfo.vala:124
#: ../common/DuplicityInfo.vala:115
msgid ""
"Without duplicity, Déjà Dup Backup Tool cannot function. It will close now."
msgstr ""
#: ../common/DuplicityInfo.vala:128
#: ../common/DuplicityInfo.vala:119
msgid "Duplicity’s version is too old"
msgstr ""
#: ../common/DuplicityInfo.vala:129
#: ../common/DuplicityInfo.vala:120
#, c-format
msgid ""
"Déjà Dup Backup Tool requires at least version %d.%d.%.2d of duplicity, but "
......@@ -514,37 +514,37 @@ msgstr ""
msgid "Paused (no network)"
msgstr ""
#: ../common/Duplicity.vala:379 ../common/Duplicity.vala:386
#: ../common/Duplicity.vala:405 ../common/Duplicity.vala:410
#: ../common/Duplicity.vala:376 ../common/Duplicity.vala:383
#: ../common/Duplicity.vala:402 ../common/Duplicity.vala:407
#: ../common/Operation.vala:79 ../common/Operation.vala:111
msgid "Preparing…"
msgstr ""
#. Was not even a file path (maybe something goofy like computer://)
#: ../common/Duplicity.vala:437
#: ../common/Duplicity.vala:434
#, c-format
msgid "Could not restore ‘%s’: Not a valid file location"
msgstr ""
#. Tiny backup location. Suggest they get a larger one.
#: ../common/Duplicity.vala:503
#: ../common/Duplicity.vala:500
msgid "Backup location is too small. Try using one with more space."
msgstr ""
#: ../common/Duplicity.vala:525
#: ../common/Duplicity.vala:522
msgid "Backup location does not have enough free space."
msgstr ""
#: ../common/Duplicity.vala:544 ../common/Duplicity.vala:558
#: ../common/Duplicity.vala:541 ../common/Duplicity.vala:555
msgid "Cleaning up…"
msgstr ""
#: ../common/Duplicity.vala:660 ../common/Duplicity.vala:1013
#: ../common/Duplicity.vala:657 ../common/Duplicity.vala:1010
#: ../deja-dup/AssistantOperation.vala:519
msgid "Failed with an unknown error."
msgstr ""
#: ../common/Duplicity.vala:874
#: ../common/Duplicity.vala:871
#, c-format
msgid "Could not restore ‘%s’: File not found in backup"
msgstr ""
......@@ -552,16 +552,16 @@ msgstr ""
#. notify upper layers, if they want to do anything
#. Duplicity tried to ask the user what the encryption password is.
#. notify upper layers, if they want to do anything
#: ../common/Duplicity.vala:880 ../common/Duplicity.vala:960
#: ../common/Duplicity.vala:964
#: ../common/Duplicity.vala:877 ../common/Duplicity.vala:957
#: ../common/Duplicity.vala:961
msgid "Bad encryption password."
msgstr ""
#: ../common/Duplicity.vala:885
#: ../common/Duplicity.vala:882
msgid "Computer name changed"
msgstr ""
#: ../common/Duplicity.vala:885
#: ../common/Duplicity.vala:882
#, c-format
msgid ""
"The existing backup is of a computer named %s, but the current computer’s "
......@@ -569,67 +569,67 @@ msgid ""
"location."
msgstr ""
#: ../common/Duplicity.vala:898
#: ../common/Duplicity.vala:895
#, c-format
msgid "Permission denied when trying to create ‘%s’."
msgstr ""
#. assume error is on backend side
#: ../common/Duplicity.vala:902 ../common/Duplicity.vala:906
#: ../common/Duplicity.vala:899 ../common/Duplicity.vala:903
#, c-format
msgid "Permission denied when trying to read ‘%s’."
msgstr ""
#: ../common/Duplicity.vala:910
#: ../common/Duplicity.vala:907
#, c-format
msgid "Permission denied when trying to delete ‘%s’."
msgstr ""
#: ../common/Duplicity.vala:917
#: ../common/Duplicity.vala:914
#, c-format
msgid "Backup location ‘%s’ does not exist."
msgstr ""
#: ../common/Duplicity.vala:923 ../common/Duplicity.vala:983
#: ../common/Duplicity.vala:920 ../common/Duplicity.vala:980
msgid "No space left."
msgstr ""
#: ../common/Duplicity.vala:937
#: ../common/Duplicity.vala:934
msgid "Invalid ID."
msgstr ""
#: ../common/Duplicity.vala:939
#: ../common/Duplicity.vala:936
msgid "Invalid secret key."
msgstr ""
#: ../common/Duplicity.vala:941
#: ../common/Duplicity.vala:938
msgid "Your Amazon Web Services account is not signed up for the S3 service."
msgstr ""
#: ../common/Duplicity.vala:954
#: ../common/Duplicity.vala:951
msgid "S3 bucket name is not available."
msgstr ""
#: ../common/Duplicity.vala:968
#: ../common/Duplicity.vala:965
#, c-format
msgid "Error reading file ‘%s’."
msgstr ""
#: ../common/Duplicity.vala:970
#: ../common/Duplicity.vala:967
#, c-format
msgid "Error writing file ‘%s’."
msgstr ""
#: ../common/Duplicity.vala:985
#: ../common/Duplicity.vala:982
#, c-format
msgid "No space left in ‘%s’."
msgstr ""
#: ../common/Duplicity.vala:993
#: ../common/Duplicity.vala:990
msgid "No backup files found"
msgstr ""
#: ../common/Duplicity.vala:1044
#: ../common/Duplicity.vala:1041
msgid "Uploading…"
msgstr ""
......@@ -653,7 +653,7 @@ msgstr ""
msgid "Listing files…"
msgstr ""
#: ../common/Operation.vala:283
#: ../common/Operation.vala:281
msgid "Another backup operation is already running"
msgstr ""
......@@ -667,11 +667,11 @@ msgctxt "back up is verb"
msgid "_Back Up"
msgstr ""
#: ../deja-dup/AssistantBackup.vala:51
#: ../deja-dup/AssistantBackup.vala:50
msgid "Creating the first backup. This may take a while."
msgstr ""
#: ../deja-dup/AssistantBackup.vala:52
#: ../deja-dup/AssistantBackup.vala:51
msgid ""
"Creating a fresh backup to protect against backup corruption. This will "
"take longer than normal."
......@@ -679,15 +679,15 @@ msgstr ""
#. Translators: This is the phrase 'Backing up' in the larger phrase
#. "Backing up '%s'". %s is a filename.
#: ../deja-dup/AssistantBackup.vala:82
#: ../deja-dup/AssistantBackup.vala:81
msgid "Backing up:"
msgstr ""
#: ../deja-dup/AssistantBackup.vala:91
#: ../deja-dup/AssistantBackup.vala:90
msgid "Backup Failed"
msgstr ""
#: ../deja-dup/AssistantBackup.vala:98
#: ../deja-dup/AssistantBackup.vala:97
msgid "Backing Up…"
msgstr ""
......@@ -892,11 +892,11 @@ msgstr[1] ""
msgid "Scanning finished"
msgstr ""
#: ../deja-dup/Assistant.vala:310
#: ../deja-dup/Assistant.vala:309
msgid "Co_ntinue"
msgstr ""
#: ../deja-dup/Assistant.vala:348 ../deja-dup/StatusIcon.vala:95
#: ../deja-dup/Assistant.vala:347 ../deja-dup/StatusIcon.vala:94
msgid "_Resume Later"
msgstr ""
......@@ -1015,35 +1015,27 @@ msgstr ""
msgid "Open Backup Settings"
msgstr ""
#: ../deja-dup/StatusIcon.vala:97
msgid "_Delay Backup"
msgstr ""
#: ../deja-dup/StatusIcon.vala:99
msgid "_Cancel Backup"
msgstr ""
#: ../deja-dup/StatusIcon.vala:100
#: ../deja-dup/StatusIcon.vala:95
msgid "_Skip Backup"
msgstr ""
#: ../deja-dup/StatusIcon.vala:132
#: ../deja-dup/StatusIcon.vala:127
msgid "Backup completed"
msgstr ""
#: ../deja-dup/StatusIcon.vala:170
#: ../deja-dup/StatusIcon.vala:165
msgid "Déjà Du_p"
msgstr ""
#: ../deja-dup/StatusIcon.vala:255
#: ../deja-dup/StatusIcon.vala:250
msgid "Starting scheduled backup"
msgstr ""
#: ../deja-dup/StatusIcon.vala:257
#: ../deja-dup/StatusIcon.vala:252
msgid "Show Progress"
msgstr ""
#: ../deja-dup/StatusIcon.vala:294
#: ../deja-dup/StatusIcon.vala:289
#, c-format
msgid "%.1f%% complete"
msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment