diff options
author | David Bremner <bremner@debian.org> | 2015-09-22 08:22:53 -0300 |
---|---|---|
committer | David Bremner <bremner@debian.org> | 2015-09-22 08:22:53 -0300 |
commit | db7a2524140c84a6dc165c41f694650e5bdde4e0 (patch) | |
tree | a671052dc4b31d9571443b6f773658132c0f505d | |
parent | 568f88f1a78d762880d89b0a65988d9f75ad9257 (diff) |
create (and use) ./debian/.debhelper/elpa in both code paths
We want to grab the description file from emacs also for single file
packages.
-rwxr-xr-x | dh_elpa | 26 |
1 files changed, 12 insertions, 14 deletions
@@ -10,6 +10,7 @@ use strict; use Cwd qw{ getcwd }; use File::Temp qw{tempfile}; use IO::Handle; +require File::Path; use Debian::Debhelper::Dh_Lib; @@ -151,6 +152,15 @@ foreach my $package (@{$dh{DOPACKAGES}}) { } my $pkg_file; + my $cwd = getcwd(); + my $tempdir = "${cwd}/debian/.debhelper/elpa"; + + File::Path::rmtree $tempdir || + error "cleaning $tempdir"; + + File::Path::make_path $tempdir || + error "creating $tempdir"; + if (scalar(@files) == 1) { my $pkg_file=$files[0]; @@ -158,23 +168,11 @@ foreach my $package (@{$dh{DOPACKAGES}}) { '--eval',"(add-to-list 'package-directory-list \"$dhelpadir\")", '--eval',"(add-to-list 'package-directory-list \"$elpadir\")", qw{-f package-initialize -l dh-elpa.el}, - qw{-f dhelpa-batch-install-file}, "$tmp/$elpadir", $pkg_file); - + qw{-f dhelpa-batch-install-file}, "$tmp/$elpadir", $pkg_file, $tempdir); } else { - my $cwd = getcwd(); - my $tempdir = "${cwd}/debian/.debhelper/elpa"; my $stagedir = "$tempdir/$elpapkg"; - { - require File::Path; - File::Path::rmtree $tempdir || - error "cleaning $tempdir"; - - File::Path::make_path $tempdir || - error "creating $tempdir"; - - File::Path::make_path $stagedir || + File::Path::make_path $stagedir || error "creating $stagedir"; - } # copy files into stagedir, flattening hierarchy # TODO: do this more correctly |