[Debpool-commits] [SCM] Debpool Project Repository branch, master, updated. debian/0.4.0-9-ge068a6b
Andres Mejia
mcitadel at gmail.com
Mon Oct 27 21:15:56 UTC 2008
The following commit has been merged in the master branch:
commit e068a6b173f50b8746c07c8bc56d4cec68073b7a
Author: Andres Mejia <mcitadel at gmail.com>
Date: Mon Oct 27 17:15:51 2008 -0400
Change perl 'require' function to 'use' function
diff --git a/bin/debpool b/bin/debpool
index 4bd95b3..ded7a53 100755
--- a/bin/debpool
+++ b/bin/debpool
@@ -38,12 +38,9 @@ use strict;
use warnings;
use POSIX; # This gets us strftime.
+use Proc::Daemon; # For daemon support.
use DebPool::Config qw(:vars);
-
-# Okay. We're more or less ready to go. First, load some modules that we
-# know we'll be calling.
-
use DebPool::Dirs qw(:functions :vars); # Directory management
use DebPool::DB qw(:functions :vars); # Various databases
use DebPool::GnuPG qw(:functions :vars); # GnuPG interaction routines
@@ -51,13 +48,15 @@ use DebPool::Logging qw(:functions :facility :level); # Logging routines
use DebPool::Packages qw(:functions :vars); # Distribution databases
use DebPool::Signal qw(:functions :vars); # Handle signals
use DebPool::Parser qw(:functions :vars); # File parsing routines
+use DebPool::Release qw(:functions); # For generated Release files
+use DebPool::Gzip; # Gzip interaction routines
+use DebPool::Bzip2; # Bzip2 interaction routines
# Before we do anything else, let's find out if we need to act as a daemon,
# and if so, whether we can manage to pull it off.
if ($Options{'daemon'}) {
- Log_Message("Trying to enter daemon mode.", LOG_GENERAL, LOG_INFO);
- require Proc::Daemon;
+ # TODO: See how we can determine if this fails.
Proc::Daemon::Init();
Log_Message("Now running as a daemon.", LOG_GENERAL, LOG_INFO);
}
@@ -74,12 +73,10 @@ if (! -d "$ENV{'HOME'}/.debpool") {
# Have support for multiple compression schemes in a dynamical fashion
my @compression_methods;
if ($Options{'compress_dists'}) {
- require DebPool::Gzip; # Gzip interaction routines
- push @compression_methods, new DebPool::Gzip;
+ push @compression_methods, DebPool::Gzip->new();
}
if ($Options{'bzcompress_dists'}) {
- require DebPool::Bzip2; # Bzip2 interaction routines
- push @compression_methods, new DebPool::Bzip2;
+ push @compression_methods, DebPool::Bzip2->();
}
# Create the directory tree. This is clean even it it already exists,
@@ -558,10 +555,7 @@ ARCH_LOOP:
my($sigfile);
if ($Options{'do_release'}) {
- require DebPool::Release;
-
# Release versions are YYYY.MM.DD.HH.MM.SS (GMT) by default.
-
my($release_version) = strftime('%Y.%m.%d.%H.%M.%S', gmtime());
$relfile = DebPool::Release::Generate_Release_Triple(
$dist, $section, $arch, $release_version);
@@ -641,8 +635,6 @@ ARCH_LOOP:
my($sigfile);
if ($Options{'do_release'}) {
- require DebPool::Release;
-
# Release versions are YYYY.MM.DD.HH.MM.SS (GMT) by default.
my($release_version) = strftime('%Y.%m.%d.%H.%M.%S', gmtime());
$relfile = DebPool::Release::Generate_Release_Dist(
diff --git a/debian/changelog b/debian/changelog
index 78e3619..8684dc9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,8 +13,9 @@ debpool (0.5.0) experimental; urgency=low
* Allow Generate_Source() to handle binary only uploads.
* Fix issue where Packages and Sources files were not being generated for
binary only uploads.
+ * Change perl 'require' function to 'use' function as appropriate.
- -- Andres Mejia <mcitadel at gmail.com> Mon, 27 Oct 2008 16:38:15 -0400
+ -- Andres Mejia <mcitadel at gmail.com> Mon, 27 Oct 2008 17:14:52 -0400
debpool (0.4.1) experimental; urgency=low
diff --git a/lib/DebPool/Bzip2.pm b/lib/DebPool/Bzip2.pm
index 397af0c..c63fc31 100644
--- a/lib/DebPool/Bzip2.pm
+++ b/lib/DebPool/Bzip2.pm
@@ -36,7 +36,7 @@ package DebPool::Bzip2;
# We use 'our', so we must have at least Perl 5.6
-require 5.006_000;
+use 5.006_000;
# Always good ideas.
@@ -44,6 +44,7 @@ use strict;
use warnings;
use POSIX; # WEXITSTATUS
+use Compress::Bzip2; # For compressing files in bzip2 format
### Module setup
@@ -86,6 +87,10 @@ our($Error);
# None
+### Our necessary DebPool modules
+
+use DebPool::Logging qw(:functions :facility :level);
+
### Meaningful functions
# Bzip_File($file)
@@ -94,13 +99,9 @@ our($Error);
# 0 (and sets $Error) on failure.
sub Bzip2_File {
- use DebPool::Logging qw(:functions :facility :level);
- use Compress::Bzip2;
-
my($file) = @_;
# Open a secure tempfile to write the compressed data into
-
my($tmpfile) = new File::Temp( SUFFIX => '.bz2' );
my $bz = bzopen($tmpfile, 'wb9');
if (!$bz) {
diff --git a/lib/DebPool/Config.pm b/lib/DebPool/Config.pm
index ec6e265..3ec7686 100644
--- a/lib/DebPool/Config.pm
+++ b/lib/DebPool/Config.pm
@@ -73,7 +73,7 @@ declare a package namespace of 'DebPool::Config' and return a true value.
# We use 'our', so we must have at least Perl 5.6
-require 5.006_000;
+use 5.006_000;
# Always good ideas.
diff --git a/lib/DebPool/DB.pm b/lib/DebPool/DB.pm
index 3d3c1f3..8d6dd18 100644
--- a/lib/DebPool/DB.pm
+++ b/lib/DebPool/DB.pm
@@ -36,7 +36,7 @@ package DebPool::DB;
# We use 'our', so we must have at least Perl 5.6
-require 5.006_000;
+use 5.006_000;
# Always good ideas.
@@ -112,6 +112,10 @@ our($Error);
# None
+### Our necessary DebPool modules
+
+use DebPool::Config qw(:vars);
+
### Meaningful functions
# Open_Databases()
@@ -120,8 +124,6 @@ our($Error);
# case of errors opening hashes, 1 otherwise.
sub Open_Databases {
- use DebPool::Config qw(:vars);
-
my($db_dir) = $Options{'db_dir'};
my($db_file_mode) = $Options{'db_file_mode'};
diff --git a/lib/DebPool/Dirs.pm b/lib/DebPool/Dirs.pm
index c167479..36950ae 100644
--- a/lib/DebPool/Dirs.pm
+++ b/lib/DebPool/Dirs.pm
@@ -36,7 +36,7 @@ package DebPool::Dirs;
# We use 'our', so we must have at least Perl 5.6
-require 5.006_000;
+use 5.006_000;
# Always good ideas.
@@ -100,6 +100,11 @@ my($inotify);
# None
+### Our necessary DebPool modules
+
+use DebPool::Config qw(:vars);
+use DebPool::Logging qw(:functions :facility :level);
+
### Meaningful functions
# Create_Tree()
@@ -109,11 +114,8 @@ my($inotify);
# or propagates $Error).
sub Create_Tree {
- use DebPool::Config qw(:vars);
-
# Basic directories - none of these are terribly exciting. We don't set
# $Error on failure, because Tree_Mkdir will have already done so.
-
if (!Tree_Mkdir($Options{'db_dir'}, $Options{'db_dir_mode'})) {
return 0;
}
@@ -309,8 +311,6 @@ sub Scan_All {
# Returns 1 on success, 0 on failure (and sets $Error).
sub Setup_Incoming_Watch {
- use DebPool::Logging qw(:functions :facility :level);
- use DebPool::Config;
if (!eval{ require Linux::Inotify2; }) {
my $msg = "liblinux-inotify2-perl is required to activate inotify ";
$msg .= "support for debpool.";
@@ -320,7 +320,7 @@ sub Setup_Incoming_Watch {
use Linux::Inotify2;
}
- $inotify = new Linux::Inotify2;
+ $inotify = Linux::Inotify2->new();
if (!$inotify) {
$Error = "Unable to create new inotify object: $!";
Log_Message("$Error", LOG_GENERAL, LOG_ERROR);
@@ -348,8 +348,6 @@ sub Setup_Incoming_Watch {
# includes interruption by a signal).
sub Watch_Incoming {
- use DebPool::Logging qw(:functions :facility :level);
-
while (my @events = $inotify->read) {
my @changes;
foreach (@events) {
@@ -371,13 +369,9 @@ sub Watch_Incoming {
# includes interruption by a signal - check $DebPool::Signal::Signal_Caught).
sub Monitor_Incoming {
- use DebPool::Config;
- use DebPool::Logging qw(:functions :facility :level);
-
# If this is ever false, we either shouldn't have been called in the
# first place, or we've caught a signal and shouldn't do anything
# further.
-
if ($DebPool::Signal::Signal_Caught) {
return;
}
@@ -438,8 +432,6 @@ sub PoolDir {
# are otherwise valid).
sub Strip_Subsection {
- use DebPool::Config qw(:vars);
-
my($section) = @_;
if (!defined($section)) {
@@ -464,8 +456,6 @@ sub Strip_Subsection {
# things are royally screwed up *anyway*...
sub PoolBasePath {
- use DebPool::Config qw(:vars);
-
my($path) = $Options{'pool_dir'};
$path =~ s/^$Options{'archive_dir'}\///;
return $path;
diff --git a/lib/DebPool/Dpkg.pm b/lib/DebPool/Dpkg.pm
index a2b8a9f..61aaa8a 100644
--- a/lib/DebPool/Dpkg.pm
+++ b/lib/DebPool/Dpkg.pm
@@ -25,7 +25,7 @@ package DebPool::Dpkg;
# We use 'our', so we must have at least Perl 5.6
-require 5.006_000;
+use 5.006_000;
# Always good ideas.
@@ -36,8 +36,6 @@ use File::Temp qw(tempfile tempdir); # For making tempfiles
use Archive::Ar; # For extracting ar files (the format for .deb files)
use Archive::Tar; # For extracting tar files
-use DebPool::Logging qw(:functions :facility :level);
-
### Module setup
BEGIN {
@@ -84,6 +82,10 @@ our($Error);
# None
+### Our necessary DebPool modules
+
+use DebPool::Logging qw(:functions :facility :level);
+
### Meaningful functions
# DpkgDeb_Control($file, $dir)
diff --git a/lib/DebPool/GnuPG.pm b/lib/DebPool/GnuPG.pm
index f73e9e5..9c595fc 100644
--- a/lib/DebPool/GnuPG.pm
+++ b/lib/DebPool/GnuPG.pm
@@ -36,7 +36,7 @@ package DebPool::GnuPG;
# We use 'our', so we must have at least Perl 5.6
-require 5.006_000;
+use 5.006_000;
# Always good ideas.
@@ -45,11 +45,8 @@ use warnings;
use POSIX; # WEXITSTATUS
use File::Temp ();
-
-# We need these for open3()
-
-use Fcntl;
-use IPC::Open3;
+use Fcntl; # for open3()
+use IPC::Open3; # for open3()
### Module setup
@@ -94,6 +91,11 @@ our($Error);
# None
+### Our necessary DebPool modules
+
+use DebPool::Config qw(:vars);
+use DebPool::Logging qw(:functions :facility :level);
+
### Meaningful functions
# Check_Signature($file, $signature)
@@ -103,9 +105,6 @@ our($Error);
# an internal signature). Returns 0 on failure, 1 on success.
sub Check_Signature {
- use DebPool::Config qw(:vars);
- use DebPool::Logging qw(:functions :facility :level);
-
my($file, $signature) = @_;
my(@args) = ('--verify', '--no-default-keyring');
@@ -162,9 +161,6 @@ sub Check_Signature {
# the filename. Returns undef, if an error occurs (and sets $Error).
sub Sign_Release {
- use DebPool::Config;
- use DebPool::Logging qw(:functions :facility :level);
-
my($release_file) = @_;
# Open a secure tempfile to write the signature to
diff --git a/lib/DebPool/Gzip.pm b/lib/DebPool/Gzip.pm
index 5aa40ba..82817c1 100644
--- a/lib/DebPool/Gzip.pm
+++ b/lib/DebPool/Gzip.pm
@@ -36,7 +36,7 @@ package DebPool::Gzip;
# We use 'our', so we must have at least Perl 5.6
-require 5.006_000;
+use 5.006_000;
# Always good ideas.
@@ -44,6 +44,7 @@ use strict;
use warnings;
use POSIX; # WEXITSTATUS
+use Compress::Zlib; # For compressing files in gzip format
### Module setup
@@ -86,6 +87,10 @@ our($Error);
# None
+### Our necessary DebPool modules
+
+use DebPool::Logging qw(:functions :facility :level);
+
### Meaningful functions
# Gzip_File($file)
@@ -94,9 +99,6 @@ our($Error);
# filename. Returns 0 (and sets $Error) on failure.
sub Gzip_File {
- use DebPool::Logging qw(:functions :facility :level);
- use Compress::Zlib;
-
my($file) = @_;
# Open a secure tempfile to write the compressed data into
diff --git a/lib/DebPool/Logging.pm b/lib/DebPool/Logging.pm
index e5fc2c2..fdd2897 100644
--- a/lib/DebPool/Logging.pm
+++ b/lib/DebPool/Logging.pm
@@ -36,7 +36,7 @@ package DebPool::Logging;
# We use 'our', so we must have at least Perl 5.6
-require 5.006_000;
+use 5.006_000;
# Always good ideas.
diff --git a/lib/DebPool/Packages.pm b/lib/DebPool/Packages.pm
index 7aaf1ce..eaaddb6 100644
--- a/lib/DebPool/Packages.pm
+++ b/lib/DebPool/Packages.pm
@@ -36,7 +36,7 @@ package DebPool::Packages;
# We use 'our', so we must have at least Perl 5.6
-require 5.006_000;
+use 5.006_000;
# Always good ideas.
diff --git a/lib/DebPool/Parser.pm b/lib/DebPool/Parser.pm
index 4d95081..9c57e39 100644
--- a/lib/DebPool/Parser.pm
+++ b/lib/DebPool/Parser.pm
@@ -36,7 +36,7 @@ package DebPool::Parser;
# We use 'our', so we must have at least Perl 5.6
-require 5.006_000;
+use 5.006_000;
# Always good ideas.
@@ -131,6 +131,11 @@ my %Field_Types = (
# None
+### Our necessary DebPool modules
+
+use DebPool::GnuPG qw(:functions); # To strip GPG encoding
+use DebPool::Logging qw(:functions :facility :level);
+
### Meaningful functions
# Parse_File($file)
@@ -142,9 +147,6 @@ my %Field_Types = (
sub Parse_File {
my ($file) = @_;
- use DebPool::GnuPG qw(:functions); # To strip GPG encoding
- use DebPool::Logging qw(:functions :facility :level);
-
# Read in the entire file, stripping GPG encoding if we find
# it. It should be small, this is fine.
my $fh;
diff --git a/lib/DebPool/Release.pm b/lib/DebPool/Release.pm
index 089e7f4..5a81d0e 100644
--- a/lib/DebPool/Release.pm
+++ b/lib/DebPool/Release.pm
@@ -36,7 +36,7 @@ package DebPool::Release;
# We use 'our', so we must have at least Perl 5.6
-require 5.006_000;
+use 5.006_000;
# Always good ideas.
@@ -45,9 +45,6 @@ use warnings;
use POSIX; # strftime
use File::Temp qw(tempfile);
-
-# We need the Digest modules so that we can calculate the proper checksums.
-
use Digest::MD5;
use Digest::SHA;
@@ -105,6 +102,12 @@ my(@SigFiles) = (
# None
+### Our necessary DebPool modules
+
+use DebPool::Config qw(:vars);
+use DebPool::Dirs qw(:functions);
+use DebPool::Util qw(:functions);
+
### Meaningful functions
# Generate_Release_Triple($archive, $component, $architecture, $version)
@@ -115,9 +118,6 @@ my(@SigFiles) = (
# Returns undef (and sets $Error) on error.
sub Generate_Release_Triple {
- use DebPool::Config qw(:vars);
- use DebPool::Dirs qw(:functions);
-
my($archive, $component, $architecture, $version) = @_;
my(@Checksums);
@@ -236,8 +236,6 @@ sub Generate_Release_Triple {
# Returns undef (and sets $Error) on error.
sub Generate_Release_Dist {
- use DebPool::Config qw(:vars);
-
my($archive) = shift(@_);
my($version) = shift(@_);
my(@files) = @_;
@@ -335,9 +333,6 @@ sub Generate_Release_Dist {
# success.
sub Install_Release {
- use DebPool::Config qw(:vars);
- use DebPool::Util qw(:functions);
-
my($archive, $component, $architecture, $release, $signature) = @_;
my($dists_file_mode) = $Options{'dists_file_mode'};
diff --git a/lib/DebPool/Signal.pm b/lib/DebPool/Signal.pm
index f8ae046..a68a10a 100644
--- a/lib/DebPool/Signal.pm
+++ b/lib/DebPool/Signal.pm
@@ -36,17 +36,13 @@ package DebPool::Signal;
# We use 'our', so we must have at least Perl 5.6
-require 5.006_000;
+use 5.006_000;
# Always good ideas.
use strict;
use warnings;
-# We do logging, so we need this.
-
-use DebPool::Logging qw(:functions :facility :level);
-
### Module setup
BEGIN {
@@ -94,6 +90,10 @@ our($Error);
# None
+### Our necessary DebPool modules
+
+use DebPool::Logging qw(:functions :facility :level);
+
### Meaningful functions
# None
diff --git a/lib/DebPool/Util.pm b/lib/DebPool/Util.pm
index 4e8e019..244089e 100644
--- a/lib/DebPool/Util.pm
+++ b/lib/DebPool/Util.pm
@@ -36,7 +36,7 @@ package DebPool::Util;
# We use 'our', so we must have at least Perl 5.6
-require 5.006_000;
+use 5.006_000;
# Always good ideas.
--
Debpool Project Repository
More information about the Debpool-commits
mailing list