[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#946142: [PATCH] log files for visibility by dh_missing (Closes: #946142)



Daniel Kahn Gillmor <dkg@fifthhorseman.net> writes:

> These changes are inspired by the recommendations in "Logging helpers
> and dh_missing" in /usr/share/doc/debhelper/PROGRAMMING.gz, and
> derived from the source of dh_installman and dh_installinfo.
>
> (The weird extraction of the file list from @action is idiosyncratic
> to dh_elpa, afaict)
>

I guess you mean @actions? I had to read this a few times to understand
that you meant something along the lines of "the list of source files is
reverse engineered from the code just below" rather than "Hell is other
people's code". I does seem a bit fragile, but I don't see an obviously
better way to do it. It is a pity log_installed_files can only be called
once.

> Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
> --- dh_elpa | 7 +++++-- 1 file changed, 5 insertions(+), 2
>  deletions(-)
>
> diff --git a/dh_elpa b/dh_elpa index 0d3739d..982ac7b 100755 ---
> a/dh_elpa +++ b/dh_elpa @@ -210,10 +210,11 @@ if ($dh{BYTECOMPILE}) {
> }
>  
>  PACKAGE: -foreach my $package (@{$dh{DOPACKAGES}}) { +foreach my
> $package (getpackages()) {

I guess it should probably be documented that this is a change needed by
dh_missing.

>  
>    my $tmp=tmpdir($package);
>    my $file=pkgfile($package,"elpa");
> +  my $skip_install = process_pkg($package) ? 0 : 1;

same here.

>  
>    my $varname="ELPA_NAME_${package}";
>    my $elpapkg = $ENV{$varname} || $ENV{ELPA_NAME};
> @@ -265,7 +266,9 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
>      push @actions, map { {"src" => $_} } @ARGV;
>    }
>  
> -  next PACKAGE if (scalar(@actions) == 0);
> +  log_installed_files($package, map { @{$_->{src}} } @actions);
> +
> +  next PACKAGE if ($skip_install or (scalar(@actions) == 0));
>  
>    my $pkg_file;
>    my $cwd = getcwd();
> -- 
> 2.24.0


Reply to: