[pkg-bioc] svn commit r362 r362 - in /trunk/tools-ng: CowBuilder.pm PBuilder.pm pkgbioc.pm r_pkg_ordering.pl r_pkg_prepare.sh r_pkg_update.pl
smoe-guest at users.alioth.debian.org
smoe-guest at users.alioth.debian.org
Sun Nov 18 21:45:24 UTC 2007
Author: smoe-guest
Date: Sun Nov 18 21:45:24 2007
New Revision: 362
URL: http://svn.debian.org/wsvn/pkg-bioc/?sc=1&rev=362
Log:
Some typos fixed, some verbosity added if $verbose.
Modified:
trunk/tools-ng/CowBuilder.pm
trunk/tools-ng/PBuilder.pm
trunk/tools-ng/pkgbioc.pm
trunk/tools-ng/r_pkg_ordering.pl
trunk/tools-ng/r_pkg_prepare.sh
trunk/tools-ng/r_pkg_update.pl
Modified: trunk/tools-ng/CowBuilder.pm
URL: http://svn.debian.org/wsvn/pkg-bioc/trunk/tools-ng/CowBuilder.pm?rev=362&op=diff
==============================================================================
--- trunk/tools-ng/CowBuilder.pm (original)
+++ trunk/tools-ng/CowBuilder.pm Sun Nov 18 21:45:24 2007
@@ -19,8 +19,8 @@ my $name = "CowBuilder";
# Create|update the cowpuilder image used for the build
sub CowBuilder_update () {
- if ( !( -x "/bin/sudo" ) or ( -x "/usr/bin/sudo" ) ) {
- die "Expected '/bin/sudo' or '/usr/bin/sudo'.\n";
+ if ( ! -x "/usr/bin/sudo" ) {
+ die "Expected '/usr/bin/sudo'.\n";
}
my $buildercommand = "sudo cowbuilder ";
die "${name}_Base is undefined, please read the documentation\n"
Modified: trunk/tools-ng/PBuilder.pm
URL: http://svn.debian.org/wsvn/pkg-bioc/trunk/tools-ng/PBuilder.pm?rev=362&op=diff
==============================================================================
--- trunk/tools-ng/PBuilder.pm (original)
+++ trunk/tools-ng/PBuilder.pm Sun Nov 18 21:45:24 2007
@@ -24,7 +24,7 @@ sub PBuilder_update () {
# pbuilder create --debootstrap debootstrap --debootstrapopts --keyring=/etc/apt/trusted.gpg
# need to pass those option to verify the deb package inside the pbuilder
# http://wiki.debian.org/SecurePbuilder
- if ( !( -x "/bin/sudo" ) or ( -x "/usr/bin/sudo" ) ) {
+ if ( ! ( -x "/bin/sudo" or -x "/usr/bin/sudo" ) ) {
die "Expected '/bin/sudo' or '/usr/bin/sudo'.\n";
}
my $buildercommand = "sudo pbuilder ";
@@ -69,11 +69,11 @@ sub PBuilder_update () {
sub PBuilder_check () {
die "You need to first create the $name base"
. " for that run in the tools-ng directory : "
- . " Please try again to read carrefully the instruction"
+ . " Please try again to read carefully the instruction"
if ( !-f $main::PBuilder_Base );
die "Something goes wrong during the deployement of your"
. " $name base (empty base file)\n"
- . " Please try again to read carrefully the instruction"
+ . " Please try again to read carefully the instruction"
if ( !-s $main::PBuilder_Base );
push( @{$main::Builder_Depends}, "dpatch" );
Modified: trunk/tools-ng/pkgbioc.pm
URL: http://svn.debian.org/wsvn/pkg-bioc/trunk/tools-ng/pkgbioc.pm?rev=362&op=diff
==============================================================================
--- trunk/tools-ng/pkgbioc.pm (original)
+++ trunk/tools-ng/pkgbioc.pm Sun Nov 18 21:45:24 2007
@@ -23,7 +23,7 @@ use PBuilder;
use CowBuilder;
our @ISA = qw(Exporter); # make these symbols known
-our @EXPORT = qw(check_requierment
+our @EXPORT = qw(check_requirement
check_directory_structure
readList
readHashList
@@ -127,7 +127,7 @@ sub doQAcheck($$) {
}
#check if the required packages are installed !
-sub check_requierment ($$$$$$) {
+sub check_requirement ($$$$$$) {
my ( $installmethod, $vs, $cache, $QAcheck, $verbose, $needpackagebefore ) =
@_;
Modified: trunk/tools-ng/r_pkg_ordering.pl
URL: http://svn.debian.org/wsvn/pkg-bioc/trunk/tools-ng/r_pkg_ordering.pl?rev=362&op=diff
==============================================================================
--- trunk/tools-ng/r_pkg_ordering.pl (original)
+++ trunk/tools-ng/r_pkg_ordering.pl Sun Nov 18 21:45:24 2007
@@ -298,7 +298,7 @@ check_directory_structure( $RepositoryLi
#checking if the required packages are installed !
installation_methods( $installMethods, "dependencies" );
-check_requierment( $installMethods, $vs, $cache, 0, $verbose,
+check_requirement( $installMethods, $vs, $cache, 0, $verbose,
$needpackagebefore );
################
Modified: trunk/tools-ng/r_pkg_prepare.sh
URL: http://svn.debian.org/wsvn/pkg-bioc/trunk/tools-ng/r_pkg_prepare.sh?rev=362&op=diff
==============================================================================
--- trunk/tools-ng/r_pkg_prepare.sh (original)
+++ trunk/tools-ng/r_pkg_prepare.sh Sun Nov 18 21:45:24 2007
@@ -31,8 +31,8 @@
# Which methods are we using for Building package ?
# Be Warm that the name given here must match a pm file
# Are actually working : PBuilder CowBuilder
-installMethods="CowBuilder"
-#installMethods="PBuilder"
+#installMethods="CowBuilder"
+installMethods="PBuilder"
### END TO EDIT, START MODE READ-ONLY!!!
@@ -115,7 +115,7 @@ webdir="../web"
Lang=""
### END - STUFF that we export - END ###
-if [ -x "/usr/bin/sudo" ] ; then
+if [ ! -x "/usr/bin/sudo" ] ; then
echo "sudo is not installed which is required for both CowBuilder and PBuilder!"
exit -1;
fi
@@ -198,7 +198,7 @@ EOHELP
fi
if [ ${CURRENTDIR} != ${toolsdirectory} ] ; then
- echo "The current directories is not called tools, "
+ echo "The current directories is not called ${$toolsdirectory}, "
echo " check http://wiki.debian.org/AliothPkgBioc"
echo "did you do a :"
echo " svn co svn://svn.debian.org/svn/pkg-bioc/trunk/${toolsdirectory} ${toolsdirectory}"
Modified: trunk/tools-ng/r_pkg_update.pl
URL: http://svn.debian.org/wsvn/pkg-bioc/trunk/tools-ng/r_pkg_update.pl?rev=362&op=diff
==============================================================================
--- trunk/tools-ng/r_pkg_update.pl (original)
+++ trunk/tools-ng/r_pkg_update.pl Sun Nov 18 21:45:24 2007
@@ -227,9 +227,12 @@ sub loadfile () {
# Loading the autogenerated files
&loadfile();
+if ($dobuilderupdate) {
+ print STDERR "Initiating update of $installMethods base.\n" if $verbose;
installation_methods( $installMethods, "update" )
- if ($dobuilderupdate);
+}
+print STDERR "Checking installation of $installMethods base.\n" if $verbose;
installation_methods( $installMethods, "check" );
################
@@ -255,13 +258,13 @@ print '[System: ', $_system->label, '; V
if $verbose;
## Doing some minimal check :
-# Checking if the directory structure is presents
+print STDERR "Checking if the directory structure is present.\n" if $verbose;
check_directory_structure( $RepositoryList, $sources, $builds );
-#checking if the required packages are installed !
+print STDERR "Checking if the required packages are installed.\n" if $verbose;
installation_methods( $installMethods, "dependencies" );
-check_requierment( $installMethods, $vs, $cache, 0, $verbose,
+check_requirement( $installMethods, $vs, $cache, 0, $verbose,
$needpackagebefore );
################
More information about the pkg-bioc-devel
mailing list