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

Proposed by Kyle Nitzsche
Status: Merged
Merged at revision: 67
Proposed branch: lp:~knitzsche/dotdepends/bug-1022674
Merge into: lp:dotdepends
Diff against target: 39 lines (+13/-2)
2 files modified
debian/changelog (+7/-0)
usr/bin/dotdepends (+6/-2)
To merge this branch: bzr merge lp:~knitzsche/dotdepends/bug-1022674
Reviewer Review Type Date Requested Status
Mike Carifio Approve
Review via email: mp+114022@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Mike Carifio (carifio) wrote :

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
Revision history for this message
Kyle Nitzsche (knitzsche) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1dotdepends (0.3.14kyle1) UNRELEASED; urgency=low
2
3 * fix recent failures of -d option on dotdepends (disables auto running of
4 dot to produce pngs in default mode). LP: #1022674
5
6 -- Kyle Nitzsche <kyle.nitzsche@canonical.com> Mon, 09 Jul 2012 14:12:10 -0400
7
1dotdepends (0.3.14) precise; urgency=low8dotdepends (0.3.14) precise; urgency=low
29
3 * usr/bin/dotdepends: move import of Dotdepends after code needed to set10 * usr/bin/dotdepends: move import of Dotdepends after code needed to set
411
=== 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 @@
256 # return process return code iff more specific256 # return process return code iff more specific
257 sys.exit(max(1, p.returncode))257 sys.exit(max(1, p.returncode))
258258
259 f1dot = f1.rstrip('.png\n') + ".dot"259 f1dot = f1.rstrip('.png\n')
260 if not f1dot.endswith(".dot"):
261 f1dot += ".dot"
260 cmd = [262 cmd = [
261 path.basename(__file__), 263 path.basename(__file__),
262 '-o', opt.output_dir, '-r', 264 '-o', opt.output_dir, '-r',
@@ -277,7 +279,9 @@
277 print >> sys.stderr, f2[1]279 print >> sys.stderr, f2[1]
278 exit(1)280 exit(1)
279 281
280 f2dot = f2[0].rstrip('.png\n') + ".dot"282 f2dot = f2[0].rstrip('.png\n')
283 if not f2dot.endswith(".dot"):
284 f2dot += ".dot"
281 #print "f2dot %s" % f2dot285 #print "f2dot %s" % f2dot
282 f3 = open(f2dot, 'r').readlines()286 f3 = open(f2dot, 'r').readlines()
283287

Subscribers

People subscribed via source and target branches

to all changes: