File deja-dup-fix-setting-drive-volume.patch of Package deja-dup

Overview Repositories Revisions Requests Users Attributes Meta

File deja-dup-fix-setting-drive-volume.patch of Package deja-dup (Revision 56c2dc6d423668f7b1e7ef5d5bf7dff0)

Currently displaying revision 56c2dc6d423668f7b1e7ef5d5bf7dff0 , Show latest

From 3390fd1b0a906b8bd4d859922844b3d57b7f5fdd Mon Sep 17 00:00:00 2001
From: Michael Terry <mike@mterry.name>
Date: Thu, 14 Sep 2017 11:41:38 -0400
Subject: BackendDrive: Fix setting a drive volume

Use get_uuid() instead of get_identifier(UUID) because it gets the
user-friendly version (i.e. the unencrypted partition, not the outer
LUKS partition).

And actually set the drive UUID when choosing it in the settings.

https://launchpad.net/bugs/1717230

diff --git a/deja-dup/widgets/ConfigLocation.vala b/deja-dup/widgets/ConfigLocation.vala
index d51d241..8bd092e 100644
--- a/deja-dup/widgets/ConfigLocation.vala
+++ b/deja-dup/widgets/ConfigLocation.vala
@@ -424,8 +424,7 @@ public class ConfigLocation : ConfigWidget
   {
     if (is_allowed_volume(v))
     {
-      add_volume_full(v.get_identifier(VolumeIdentifier.UUID),
-                      v.get_name(), v.get_icon());
+      add_volume_full(v.get_uuid(), v.get_name(), v.get_icon());
     }
   }
 
@@ -445,8 +444,7 @@ public class ConfigLocation : ConfigWidget
 
   void update_volume(VolumeMonitor monitor, Volume v)
   {
-    update_volume_full(v.get_identifier(VolumeIdentifier.UUID),
-                       v.get_name(), v.get_icon());
+    update_volume_full(v.get_uuid(), v.get_name(), v.get_icon());
   }
 
   void update_volume_full(string uuid, string name, Icon icon)
@@ -460,7 +458,7 @@ public class ConfigLocation : ConfigWidget
 
   void remove_volume(VolumeMonitor monitor, Volume v)
   {
-    remove_volume_full(v.get_identifier(VolumeIdentifier.UUID));
+    remove_volume_full(v.get_uuid());
   }
 
   void remove_volume_full(string uuid)
@@ -622,6 +620,7 @@ public class ConfigLocation : ConfigWidget
 
     // First things first, we must remember that we set a volume
     all_settings[""].set_string(BACKEND_KEY, "drive");
+    all_settings[DRIVE_ROOT].set_string(DRIVE_UUID_KEY, uuid);
 
     var vol = VolumeMonitor.get().get_volume_for_uuid(uuid);
     if (vol == null) {
diff --git a/libdeja/BackendDrive.vala b/libdeja/BackendDrive.vala
index dcfe450..86c752c 100644
--- a/libdeja/BackendDrive.vala
+++ b/libdeja/BackendDrive.vala
@@ -125,7 +125,7 @@ public class BackendDrive : BackendFile
     var icon = volume.get_icon();
 
     // sanity check that these writable settings are for this volume
-    var vol_uuid = volume.get_identifier(VolumeIdentifier.UUID);
+    var vol_uuid = volume.get_uuid();
     var settings_uuid = settings.get_string(DRIVE_UUID_KEY);
     if (vol_uuid != settings_uuid)
       return;
-- 
cgit v0.10.2

Places

File deja-dup-fix-setting-drive-volume.patch of Package deja-dup (Revision 56c2dc6d423668f7b1e7ef5d5bf7dff0)

Places