[Reproducible-commits] [debhelper] 36/61: Replace more doit('install' ...) calls to install_X
Mattia Rizzolo
mattia at mapreri.org
Sat Apr 4 18:37:35 UTC 2015
This is an automated email from the git hooks/post-receive script.
mapreri-guest pushed a commit to branch pu/reproducible_builds
in repository debhelper.
commit 16e72623aef639ae4fb67cf4a365adc10dd6865c
Author: Niels Thykier <niels at thykier.net>
Date: Thu Jan 8 20:20:13 2015 +0100
Replace more doit('install' ...) calls to install_X
Signed-off-by: Niels Thykier <niels at thykier.net>
---
dh_auto_install | 2 +-
dh_bugfiles | 9 +++++----
dh_gconf | 5 +++--
dh_installemacsen | 5 +++--
dh_installgsettings | 5 +++--
dh_installinit | 16 ++++++++--------
dh_lintian | 4 ++--
dh_shlibdeps | 2 +-
8 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/dh_auto_install b/dh_auto_install
index a580e0b..afc9cf1 100755
--- a/dh_auto_install
+++ b/dh_auto_install
@@ -83,7 +83,7 @@ $destdir = File::Spec->rel2abs($destdir, cwd());
foreach my $package (@{$dh{DOPACKAGES}}) {
my $tmp=tmpdir($package);
if (! -e $tmp) {
- doit("install","-d",$tmp);
+ install_dir($tmp);
}
}
diff --git a/dh_bugfiles b/dh_bugfiles
index 90498a4..0b5edf0 100755
--- a/dh_bugfiles
+++ b/dh_bugfiles
@@ -95,20 +95,21 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
# If there is only a bug script to install, install it as
# usr/share/bug/$package (unless this path is a directory)
if (! -d $dir && scalar(keys(%bugfiles)) == 1 && exists $bugfiles{script}) {
- doit("install","-D","-p","-m755",$bugfiles{script},$dir);
+ install_dir($dir);
+ install_file($bugfiles{script}, $dir);
}
elsif (scalar(keys(%bugfiles)) > 0) {
if (-f $dir) {
# Move usr/share/bug/$package to usr/share/bug/$package/script
doit("mv", $dir, "${dir}.tmp");
- doit("install","-d",$dir);
+ install_dir($dir);
doit("mv", "${dir}.tmp", "$dir/script");
}
elsif (! -d $dir) {
- doit("install","-d",$dir);
+ install_dir($dir);
}
while (my ($type, $srcfile) = each(%bugfiles)) {
- doit("install","-p","-m644",$srcfile, "$dir/$type");
+ install_file($srcfile, "$dir/$type");
}
}
diff --git a/dh_gconf b/dh_gconf
index 7b099da..0e13057 100755
--- a/dh_gconf
+++ b/dh_gconf
@@ -65,8 +65,9 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
my $mandatory = pkgfile($package, "gconf-mandatory");
if ($mandatory ne '') {
- doit("mkdir","-p","$tmp/usr/share/gconf/mandatory");
- doit("install","-p","-m644",$mandatory,"$tmp/usr/share/gconf/mandatory/${priority}_$package");
+ install_dir("$tmp/usr/share/gconf/mandatory");
+ install_file($mandatory,
+ "$tmp/usr/share/gconf/mandatory/${priority}_$package");
}
my $defaults = pkgfile($package,"gconf-defaults");
if ($defaults ne '') {
diff --git a/dh_installemacsen b/dh_installemacsen
index 1a1f008..a4884a5 100755
--- a/dh_installemacsen
+++ b/dh_installemacsen
@@ -100,9 +100,10 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
if ($emacsen_compat ne '') {
if (! -d "$tmp/usr/lib/emacsen-common/packages/compat") {
- doit("install","-d","$tmp/usr/lib/emacsen-common/packages/compat");
+ install_dir("$tmp/usr/lib/emacsen-common/packages/compat");
}
- doit("install","-m0644",$emacsen_compat,"$tmp/usr/lib/emacsen-common/packages/compat/$package");
+ install_file($emacsen_compat,
+ "$tmp/usr/lib/emacsen-common/packages/compat/$package");
}
if ($emacsen_install ne '') {
diff --git a/dh_installgsettings b/dh_installgsettings
index 8552e63..66de51a 100755
--- a/dh_installgsettings
+++ b/dh_installgsettings
@@ -68,8 +68,9 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
my $override = pkgfile($package,"gsettings-override");
if ($override ne '') {
- doit("mkdir","-p",$gsettings_schemas_dir);
- doit("install","-p","-m644",$override,"$gsettings_schemas_dir/${priority}_$package.gschema.override");
+ install_dir($gsettings_schemas_dir);
+ install_file($override,
+ "$gsettings_schemas_dir/${priority}_$package.gschema.override");
}
if (-d "$gsettings_schemas_dir") {
diff --git a/dh_installinit b/dh_installinit
index d5f413a..c4c8a92 100755
--- a/dh_installinit
+++ b/dh_installinit
@@ -197,30 +197,30 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
my $service=pkgfile($package,"service");
if ($service ne '' && ! $dh{ONLYSCRIPTS}) {
my $path="$tmp/lib/systemd/system";
- if (! -d "$path") {
- doit("install","-d","$path");
+ if (! -d $path) {
+ install_dir($path);
}
- doit("install","-p","-m644",$service,"$path/$script.service");
+ install_file($service, "$path/$script.service");
}
my $tmpfile=pkgfile($package,"tmpfile");
if ($tmpfile ne '' && ! $dh{ONLYSCRIPTS}) {
my $path="$tmp/usr/lib/tmpfiles.d";
- if (! -d "$path") {
- doit("install","-d","$path");
+ if (! -d $path) {
+ install_dir($path);
}
- doit("install","-p","-m644",$tmpfile,"$path/$script.conf");
+ install_file($tmpfile, "$path/$script.conf");
}
my $job=pkgfile($package,"upstart");
if ($job ne '' && ! $dh{ONLYSCRIPTS}) {
if (! -d "$tmp/etc/init") {
- doit("install","-d","$tmp/etc/init");
+ install_dir("$tmp/etc/init");
}
- doit("install","-p","-m644",$job,"$tmp/etc/init/$jobfile.conf");
+ install_file($job, "$tmp/etc/init/$jobfile.conf");
}
my $default=pkgfile($package,'default');
diff --git a/dh_lintian b/dh_lintian
index e8f9d72..555122a 100755
--- a/dh_lintian
+++ b/dh_lintian
@@ -49,8 +49,8 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
my $overrides=pkgfile($package,"lintian-overrides");
if ($overrides ne '') {
- if (! -d "$or_dir") {
- doit("install","-d","$or_dir");
+ if (! -d $or_dir) {
+ install_dir($or_dir);
}
install_dh_config_file($overrides, "$or_dir/$package");
}
diff --git a/dh_shlibdeps b/dh_shlibdeps
index 19b6728..97109e3 100755
--- a/dh_shlibdeps
+++ b/dh_shlibdeps
@@ -105,7 +105,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
# dpkg-shlibdeps expects this directory to exist
if (! -d "$tmp/DEBIAN") {
- doit("install","-o",0,"-g",0,"-d","$tmp/DEBIAN");
+ install_dir("$tmp/DEBIAN");
}
my @filelist;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/debhelper.git
More information about the Reproducible-commits
mailing list