Merge lp:~knitzsche/dotdepends/bug-1022674 into lp:dotdepends

[Kyle Nitzsche]

[Mike Carifio (carifio)]

You're relying on .png being the only graphical output format rather than testing the -d switch directly. If you ever adopt multiple graphics formats, you might have to update this. But let's press ahead.

review: Approve

[Kyle Nitzsche (knitzsche)]

Mike: good point. Although png is the currently single hardcoded format if -d is used.

=== modified file 'debian/changelog'
--- debian/changelog	2012-07-09 17:48:25 +0000
+++ debian/changelog	2012-07-09 18:21:18 +0000
@@ -1,3 +1,10 @@
+dotdepends (0.3.14kyle1) UNRELEASED; urgency=low
+
+  * fix recent failures of -d option on dotdepends (disables auto running of
+    dot to produce pngs in default mode). LP: #1022674
+
+ -- Kyle Nitzsche <[e-mail]>  Mon, 09 Jul 2012 14:12:10 -0400
+
 dotdepends (0.3.14) precise; urgency=low
 
   * usr/bin/dotdepends: move import of Dotdepends after code needed to set

=== modified file 'usr/bin/dotdepends'
--- usr/bin/dotdepends	2012-07-09 17:30:46 +0000
+++ usr/bin/dotdepends	2012-07-09 18:21:18 +0000
@@ -256,7 +256,9 @@
             # return process return code iff more specific
             sys.exit(max(1, p.returncode))
 
-        f1dot = f1.rstrip('.png\n') + ".dot"
+        f1dot = f1.rstrip('.png\n')
+        if not f1dot.endswith(".dot"):
+            f1dot += ".dot"
         cmd = [
                 path.basename(__file__), 
                 '-o', opt.output_dir, '-r', 
@@ -277,7 +279,9 @@
             print >> sys.stderr, f2[1]
             exit(1)
         
-        f2dot = f2[0].rstrip('.png\n') + ".dot"
+        f2dot = f2[0].rstrip('.png\n')
+        if not f2dot.endswith(".dot"):
+            f2dot += ".dot"
         #print "f2dot %s" % f2dot
         f3 = open(f2dot, 'r').readlines()