# HG changeset patch # User Heiko Schlittermann (JUMPER) # Date 1420451628 -3600 # Node ID 42d1df86ad05493df714ec37331a13071318a578 # Parent 3c641ac6493d0403b2ced5b544d6bd21c9228269 quieten the perl compiler diff -r 3c641ac6493d -r 42d1df86ad05 debian/rules --- a/debian/rules Sat Jan 03 22:47:10 2015 +0100 +++ b/debian/rules Mon Jan 05 10:53:48 2015 +0100 @@ -4,6 +4,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +export PERL5LIB= %: dh $@ @@ -17,85 +18,3 @@ override_dh_installman: dh_installmanpages -#-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) -#- CFLAGS += -g -#-endif -#-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) -#- INSTALL_PROGRAM += -s -#-endif -#- -#-configure: configure-stamp -#-configure-stamp: -#- dh_testdir -#- # Add here commands to configure the package. -#- -#- touch configure-stamp -#- -#- -#-build: build-stamp -#- -#-build-stamp: configure-stamp -#- dh_testdir -#- -#- # Add here commands to compile the package. -#- $(MAKE) prefix=/usr -#- #/usr/bin/docbook-to-man debian/logbuch.sgml > logbuch.1 -#- -#- touch build-stamp -#- -#-clean: -#- dh_testdir -#- dh_testroot -#- rm -f build-stamp configure-stamp -#- -#- # Add here commands to clean up after the build process. -#- -$(MAKE) clean -#- -#- dh_clean -#- -#-install: build -#- dh_testdir -#- dh_testroot -#- dh_clean -k -#- dh_installdirs -#- -#- # Add here commands to install the package into debian/logbuch. -#- $(MAKE) install DESTDIR=debian/logbuch prefix=/usr -#- -#- -#-# Build architecture-independent files here. -#-binary-indep: build install -#-# We have nothing to do by default. -#- -#-# Build architecture-dependent files here. -#-binary-arch: build install -#- dh_testdir -#- dh_testroot -#-# dh_installdebconf -#- dh_installdocs -#-# dh_installexamples -#-# dh_installmenu -#-# dh_installlogrotate -#-# dh_installemacsen -#-# dh_installpam -#-# dh_installmime -#-# dh_installinit -#-# dh_installcron -#-# dh_installman -#-# dh_installinfo -#-# dh_undocumented -#- dh_installchangelogs -#-# dh_link -#-# dh_strip -#-# dh_compress -#-# dh_fixperms -#-# dh_makeshlibs -#- dh_installdeb -#- dh_perl -#-# dh_shlibdeps -#- dh_gencontrol -#- dh_md5sums -#- dh_builddeb -#- -#-binary: binary-indep binary-arch -#-.PHONY: build clean binary-indep binary-arch binary install configure diff -r 3c641ac6493d -r 42d1df86ad05 log.pl --- a/log.pl Sat Jan 03 22:47:10 2015 +0100 +++ b/log.pl Mon Jan 05 10:53:48 2015 +0100 @@ -39,6 +39,7 @@ use lib "/etc/logbuch"; use config; + # print @config::mailto, "\n"; #+-------+---------------+------+-----+---------+----------------+ @@ -63,14 +64,18 @@ my $MAGIC = "#--- all changes below are ignored ---#\n"; my $NODENAME = (split /\./, hostname)[0]; -my $opt_db = $config::db // 1; +package config { + # default values if not set in the config file + our $db //= 1; + our $logfile = "/root/LOG.$NODENAME"; +} + +my $opt_db = $config::db; my $opt_mail = 1; my $opt_message = ""; my $opt_apt = ""; my $opt_initdir = ""; -my $opt_file = defined $config::logfile # use it twice - ? $config::logfile - : "/root/LOG.$NODENAME"; +my $opt_file = $config::logfile; my $Dbh;