Update of /cvsroot/fink/fink/perlmod/Fink
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv30988
Modified Files:
ChangeLog Engine.pm
Log Message:
More pedantic matching of %n only (even if no whitespace before
versioning) in dependencies for list --format=dotty
Index: Engine.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/Engine.pm,v
retrieving revision 1.436
retrieving revision 1.437
diff -u -d -r1.436 -r1.437
--- Engine.pm 9 May 2009 18:08:37 -0000 1.436
+++ Engine.pm 17 Jun 2009 16:14:13 -0000 1.437
@@ -618,10 +618,13 @@
if ($format eq 'dotty') {
print "\"$pname\" [shape=box];\n";
if (ref $vo) {
+ # grab the Depends of pkg (not BDep, not others
in family)
for my $dep (@{$vo->get_depends()}) {
+ # for each ANDed (comma-sep) chunk...
for my $subdep (@$dep) {
- $subdep =~ s/^(\S+).*?$/$1/;
- print "\"$pname\" ->
\"$subdep\";\n";
+ # include all ORed items in it
+ $subdep =~ /^([+\-.a-z0-9]+)/;
# only %n, not versioning
+ print "\"$pname\" -> \"$1\";\n";
}
}
}
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1623
retrieving revision 1.1624
diff -u -d -r1.1623 -r1.1624
--- ChangeLog 6 Jun 2009 14:24:54 -0000 1.1623
+++ ChangeLog 17 Jun 2009 16:14:12 -0000 1.1624
@@ -1,3 +1,7 @@
+2009-06-17 Daniel Macks <dma...@netspace.org>
+
+ * Engine.pm: Try harder to omit versioning in dotty dependency output
+
2009-06-05 Benjamin Reed <rangerr...@users.sourceforge.net>
* Validation.pm: Allow %p/opt and %p/local
@@ -6,6 +10,10 @@
* Bootstrap.pm: Auto-update apt-dev if new version available
+2009-05-18 Daniel Macks <dma...@netspace.org>
+
+ * Bootstrap.pm: Auto-update apt-dev if new version available
+
2009-05-15 Dave Morrison <d...@finkproject.org>
* Services.pm: aptget_lockwait now specifies the full path to the
------------------------------------------------------------------------------
Crystal Reports - New Free Runtime and 30 Day Trial
Check out the new simplified licensing option that enables unlimited
royalty-free distribution of the report engine for externally facing
server and web deployment.
http://p.sf.net/sfu/businessobjects
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
