← Back to branch summary

~teejee2008/timeshift/trunk

« back to all changes in this revision

Viewing changes to src/Core/Main.vala

  • Committer: Tony George
  • Date: 2017-01-05 17:38:38 UTC
  • Revision ID: tony.george.kol@gmail.com-20170105173838-j5vwugkh6qigt7l3
Console: Increase page size to 20 for displaying list of snapshots; Avoid initializing the repo twice;

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/Core/Main.vala
1070
1070
                
1071
1071
                log_msg(_("Creating new snapshot...") + "(RSYNC)");
1072
1072
 
1073
 
                if (btrfs_mode){
1074
 
                        log_msg(_("Saving to device") + ": %s".printf(repo.device.device) + ", " + _("mounted at path") + ": %s".printf(repo.mount_paths["@"]));
1075
 
                        log_msg(_("Saving to device") + ": %s".printf(repo.device.device) + ", " + _("mounted at path") + ": %s".printf(repo.mount_paths["@home"]));
1076
 
                }
1077
 
                else{
1078
 
                        log_msg(_("Saving to device") + ": %s".printf(repo.device.device) + ", %s".printf(repo.mount_path));
1079
 
                }
 
1073
                log_msg(_("Saving to device") + ": %s".printf(repo.device.device) + ", " + _("mounted at path") + ": %s".printf(repo.mount_path));
1080
1074
                
1081
1075
                // take new backup ---------------------------------
1082
1076
 
1222
1216
        private Snapshot? create_snapshot_with_btrfs(string tag, DateTime dt_created){
1223
1217
                
1224
1218
                log_msg(_("Creating new backup...") + "(BTRFS)");
1225
 
                
 
1219
 
 
1220
                log_msg(_("Saving to device") + ": %s".printf(repo.device.device) + ", " + _("mounted at path") + ": %s".printf(repo.mount_paths["@"]));
 
1221
                if ((repo.device_home != null) && (repo.device_home.uuid != repo.device.uuid)){
 
1222
                        log_msg(_("Saving to device") + ": %s".printf(repo.device_home.device) + ", " + _("mounted at path") + ": %s".printf(repo.mount_paths["@home"]));
 
1223
                }
 
1224
 
1226
1225
                // take new backup ---------------------------------
1227
1226
 
1228
1227
                if (repo.mount_path.length == 0){
2816
2815
                // use system disk for backup in btrfs mode
2817
2816
                if (((app_mode == "backup")||((app_mode == "ondemand"))) && btrfs_mode){
2818
2817
                        if (sys_root != null){
2819
 
                                log_msg("Using system disk as snapshot device for creating snapshot in BTRFS mode");
 
2818
                                log_msg("Using system disk as snapshot device for creating snapshots in BTRFS mode");
2820
2819
                                if (cmd_backup_device.length > 0){
2821
 
                                        log_msg(_("Option --snapshot-device should not be specified when creating backups in BTRFS mode"));
 
2820
                                        log_msg(_("Option --snapshot-device should not be specified for creating snapshots in BTRFS mode"));
2822
2821
                                }
2823
2822
                                repo = new SnapshotRepo.from_device(sys_root, parent_window, btrfs_mode);
2824
2823
                        }