r54541 - in /trunk/dh-make-perl: TODO lib/DhMakePerl/Command/refresh.pm

[dmn at users.alioth.debian.org]

Author: dmn
Date: Fri Mar 19 07:01:22 2010
New Revision: 54541

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=54541
Log:
refresh: use discover_dependencies instead of dependencies_from_cpan_meta

not refresh uses the very same code that make uses

finally TODO--

Modified:
    trunk/dh-make-perl/TODO
    trunk/dh-make-perl/lib/DhMakePerl/Command/refresh.pm

Modified: trunk/dh-make-perl/TODO
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/TODO?rev=54541&op=diff
==============================================================================
--- trunk/dh-make-perl/TODO (original)
+++ trunk/dh-make-perl/TODO Fri Mar 19 07:01:22 2010
@@ -25,5 +25,3 @@
   files and look them in the apt file contents. Lots of work for little gain.
 * --refresh: add --only <file> option: done, but "--only control" also
   touches d/rules if quilt is used
-* refresh: should use the generic discover_dependencies from ::Packaging
-  instead of its own implementation

Modified: trunk/dh-make-perl/lib/DhMakePerl/Command/refresh.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/lib/DhMakePerl/Command/refresh.pm?rev=54541&op=diff
==============================================================================
--- trunk/dh-make-perl/lib/DhMakePerl/Command/refresh.pm (original)
+++ trunk/dh-make-perl/lib/DhMakePerl/Command/refresh.pm Fri Mar 19 07:01:22 2010
@@ -80,8 +80,18 @@
             catfile( $self->debian_dir, 'source', 'format' ) );
 
         if ( my $apt_contents = $self->get_apt_contents ) {
-            $control->dependencies_from_cpan_meta( $self->meta,
-                $self->get_apt_contents, $self->cfg->verbose );
+            $control->discover_dependencies(
+                {   dir          => $self->main_dir,
+                    verbose      => $self->cfg->verbose,
+                    apt_contents => $self->apt_contents,
+                    require_deps => $self->cfg->requiredeps,
+                    wnpp_query   => Debian::WNPP::Query->new(
+                        {   cache_file =>
+                                catfile( $self->cfg->home_dir, 'wnpp.cache' )
+                        }
+                    ),
+                }
+            );
         }
         else {
             warn "No APT contents can be loaded.\n";