Merge lp:~knitzsche/dotdepends/fixes-1018582 into lp:dotdepends

[Kyle Nitzsche]

fixes-1018582
and man page indentation error

[Mike Carifio (carifio)]

line 9: 'gerated' -> 'generated'

[Mike Carifio (carifio)]

don't need to see you fix the typo

review: Approve

=== modified file 'Dotdepends/Dot.py'
--- Dotdepends/Dot.py	2012-06-22 17:04:02 +0000
+++ Dotdepends/Dot.py	2012-06-27 20:52:17 +0000
@@ -188,10 +188,18 @@
         return fams
 
     def remove_root_family(self, fams, root):
+        """If the root node is found to be summarizable as a family, remove it
+        from the dictionary of families in order to keep the gerated data 
+        clear. That is, all direct depends of the root node should be separate
+        nodes rather than being included in the top level famliy."""
+
         if root == "":
             print "Error. You must set the root package (node) with -r PKG. Stopping"
             sys.exit(1)
-        del fams[root]
+        try:
+            fams.pop(root)
+        except KeyError:
+            pass # it's OK if the root node is not a family
         return fams
 
     def process_families(self,fams):

=== modified file 'data/dotdepends.1'
--- data/dotdepends.1	2012-06-22 17:04:02 +0000
+++ data/dotdepends.1	2012-06-27 20:52:17 +0000
@@ -27,7 +27,6 @@
 .br
 .SS
 \fBSpecify the Mode\fR: You can generate a single detailed (no families) graph (and related files) for the PKG's \fBdependencies\fR or for its \fBreverse dependencies\fR with the \fB-m MODE\fR argument, for example: \fBdotdepends -m rdepends gedit\fR.
-.HP
 This mode produces (a dot and) a png that is defined by the scope specified by command arguments. For example, one can include recommends with the \fB-r\fR argument, and one can limit rdepends to installed packages with the \fB-i\fR argument.
 .br
 The generated file name is reported on stdout. The file name describes the scope of execution as defined by the relevant arguments. For example: fontconfig-depends-Installed-NoRecommends-NoSuggests-NoEnhances.png is: for fontconfig package, in depends mode, limited to installed packages, with no recommends, no suggests, and no enhances packages included.
@@ -38,13 +37,13 @@
 .br
 .SS \fBColors\fR
 .HP
-\fBBlack box borders\fR show packages or package families that would always be installed due to depends. (If the family contains a member that is only recommended -- has no depends on it -- then the box is still black bordered. However, you can see such internal details in the DETAIL png.)
+\fBBlack box borders\fR show packages or package families that would always be installed due to depends. (If the family contains a member that is only recommended -- has no depends on it -- then the family box is still black bordered. However, you can see such internal details in the DETAIL png.)
 .HP
 \fBRed box borders\fR show packages or package families that would only be installed if Install-Recommends is enabled.
 .HP
 \fBBlack arrows\fR show depends relationships.
 .HP
-\fBRed arrows\fR show depends relationships.
+\fBRed arrows\fR show recommends relationships.
 .HP
 \fBYellow filled boxes\fR are family nodes.
 .HP

=== modified file 'debian/changelog'
--- debian/changelog	2012-06-26 13:42:16 +0000
+++ debian/changelog	2012-06-27 20:52:17 +0000
@@ -1,3 +1,11 @@
+dotdepends (0.3.9) precise; urgency=low
+
+  * Dont' crash when removing the root node family from the dictionary of
+    families when there are no found families. (LP: #1018582)
+  * Fix indentation error in dotdepends man page.
+
+ -- Kyle Nitzsche <[e-mail]>  Wed, 27 Jun 2012 16:40:58 -0400
+
 dotdepends (0.3.8) precise; urgency=low
 
   * debian/control: Added Build-Depends: python-nose