Remove --no-resume.

There is no real reason for this option. Resuming a previously
cancelled snapshot is generally a very good idea, so the option is
kind of pointless. Remove it.

diff --git a/dss.c b/dss.c
index aa8c0ea3860086bd4ca9f22b8e8c2354c3f2cc3b..9417e260fcabf40386d13ac9b4742dc1dbfc9aba 100644 (file)
--- a/dss.c
+++ b/dss.c
@@ -1124,8 +1124,6 @@ static int rename_resume_snap(int64_t creation_time)
        sl.num_snapshots = 0;
 
        ret = 0;
-       if (conf.no_resume_given)
-               goto out;
        dss_get_snapshot_list(&sl);
        /*
         * Snapshot recycling: We first look at the newest snapshot. If this

diff --git a/dss.ggo b/dss.ggo
index 12871eaa9eabd78bb8006f2ca2b636b2c486dd92..48ec432d24cf4f4a07f722d7e90e58f392bf5727 100644 (file)
--- a/dss.ggo
+++ b/dss.ggo
@@ -216,21 +216,6 @@ details="
        dss.
 "
 
-option "no-resume" -
-#~~~~~~~~~~~~~~~~~~~
-"Do not try to resume from previous runs"
-flag off
-details = "
-       Starting from version 0.1.4, dss tries to resume from a
-       previously cancelled dss instance by default. It does so by
-       looking at the status of the most recently created snapshot. If
-       this snapshot status is incomplete, its directory is reused
-       as the destination directory for a subsequent rsync run.
-
-       The --no-resume option deactivates this feature so that a new
-       directory is always used as the rsync destination directory.
-"
-
 option "rsync-option" O
 #~~~~~~~~~~~~~~~~~~~~~~
 "Further rsync options"