From: Michal Vaner Date: Thu, 21 Aug 2008 21:17:43 +0000 (+0200) Subject: Startup belongs to the package X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=94781b45e2337c21ca1d8ab9ff5f76c8899cf5aa;p=pciids.git Startup belongs to the package --- diff --git a/PciIds/Config.pm b/PciIds/Config.pm index a179689..8d7a98a 100644 --- a/PciIds/Config.pm +++ b/PciIds/Config.pm @@ -1,7 +1,7 @@ package PciIds::Config; use strict; use warnings; -use Startup; +use PciIds::Startup; use base 'Exporter'; our @EXPORT = qw(&checkConf &defConf %config &confList); diff --git a/PciIds/Startup.pm b/PciIds/Startup.pm new file mode 100644 index 0000000..c8284d9 --- /dev/null +++ b/PciIds/Startup.pm @@ -0,0 +1,13 @@ +package PciIds::Startup; +use strict; +use warnings; +use base 'Exporter'; + +#Where are data? +our $directory = '/home/vorner/prog/pciids/'; +our @EXPORT=qw($directory); + +#Where are the modules? +use lib ( '/home/vorner/prog/pciids/' ); + +1; diff --git a/PciIds/Users.pm b/PciIds/Users.pm index d437f9c..3f6e38e 100644 --- a/PciIds/Users.pm +++ b/PciIds/Users.pm @@ -7,7 +7,7 @@ use DBI; use PciIds::Config; use Digest::MD5 qw(md5_base64 md5_hex);#TODO Some better algorithm? use HTML::Entities; -use Startup; +use PciIds::Startup; use PciIds::Log; use Apache2::Connection; diff --git a/Startup.pm b/Startup.pm deleted file mode 100644 index fcda725..0000000 --- a/Startup.pm +++ /dev/null @@ -1,13 +0,0 @@ -package Startup; -use strict; -use warnings; -use base 'Exporter'; - -#Where are data? -our $directory = '/home/vorner/prog/pciids/'; -our @EXPORT=qw($directory); - -#Where are the modules? -use lib ( '/home/vorner/prog/pciids/' ); - -1;