From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 6 Jun 2015 10:53:00 +0000 (+0000)
Subject: client: Allow better escaping for custom intervals
X-Git-Tag: 003~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c9351f4fcc70010ebbf0b831e4451a509a890c1b;p=collecty.git

client: Allow better escaping for custom intervals

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/collecty/plugins/base.py b/src/collecty/plugins/base.py
index 76eaad6..bed461f 100644
--- a/src/collecty/plugins/base.py
+++ b/src/collecty/plugins/base.py
@@ -435,13 +435,13 @@ class GraphTemplate(object):
 			if self.upper_limit is not None:
 				args += ["--upper-limit", self.upper_limit]
 
-		# Add interval
-		args.append("--start")
-
 		try:
-			args.append(self.intervals[interval])
+			interval = self.intervals[interval]
 		except KeyError:
-			args.append(str(interval))
+			interval = "end-%s" % interval
+
+		# Add interval
+		args += ["--start", interval]
 
 		return args