[pkg-bioc] svn commit r355 r355 - in /trunk/tools-ng: CowBuilder.pm PBuilder.pm pkgbioc.pm r_pkg_prepare.sh

[David Vernazobres]

Hi Steffen,
OK, so linda and lintian are both need on the system. dpatch and
r-base-dev should definitly not be list there. I will have a quick look
tomorrow and correct theses anomalies.
david

On Mon, Nov 12, 2007 at 06:35:04PM -0000, smoe-guest at users.alioth.debian.org wrote :
> Author: smoe-guest
> Date: Mon Nov 12 18:35:04 2007
> New Revision: 355
> 
> URL: http://svn.debian.org/wsvn/pkg-bioc/?sc=1&rev=355
> Log:
> Hi David,
> 
> nice stuff you did. I'll initiate the downloading now.
> 
> These messages here...
> ERROR linda is not installed
> ERROR dpatch is not installed
> ERROR lintian is not installed
> ERROR r-base-dev is not installed
> 
> are they indicating that I should install these bits in the cowbuilder chroot or in the regular filesystem? If the latter, why should r-base-dev be installed?
> 
> Best
> 
> Steffen
> 
> 
> Modified:
>     trunk/tools-ng/CowBuilder.pm
>     trunk/tools-ng/PBuilder.pm
>     trunk/tools-ng/pkgbioc.pm
>     trunk/tools-ng/r_pkg_prepare.sh
> 
> Modified: trunk/tools-ng/CowBuilder.pm
> URL: http://svn.debian.org/wsvn/pkg-bioc/trunk/tools-ng/CowBuilder.pm?rev=355&op=diff
> ==============================================================================
> --- trunk/tools-ng/CowBuilder.pm (original)
> +++ trunk/tools-ng/CowBuilder.pm Mon Nov 12 18:35:04 2007
> @@ -59,7 +59,7 @@ sub CowBuilder_update () {
>  }
>  
>  sub CowBuilder_check() {
> -    die "You need to first create the $name base"
> +    die "You need to first create the $name base.\n"
>        . "Something goes wrong during the deployement of your"
>        . " $name base (empty base file)\n"
>        . " Please try again to read carrefully the instruction"
> 
> Modified: trunk/tools-ng/PBuilder.pm
> URL: http://svn.debian.org/wsvn/pkg-bioc/trunk/tools-ng/PBuilder.pm?rev=355&op=diff
> ==============================================================================
> --- trunk/tools-ng/PBuilder.pm (original)
> +++ trunk/tools-ng/PBuilder.pm Mon Nov 12 18:35:04 2007
> @@ -24,6 +24,9 @@ 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" )) {
> +       die "Expected '/bin/sudo' or '/usr/bin/sudo'.\n";
> +    }
>      my $buildercommand = "sudo pbuilder ";
>      die "${name}_Base is undefined, please read the documentation\n"
>        unless ( defined($main::PBuilder_Base)
> 
> Modified: trunk/tools-ng/pkgbioc.pm
> URL: http://svn.debian.org/wsvn/pkg-bioc/trunk/tools-ng/pkgbioc.pm?rev=355&op=diff
> ==============================================================================
> --- trunk/tools-ng/pkgbioc.pm (original)
> +++ trunk/tools-ng/pkgbioc.pm Mon Nov 12 18:35:04 2007
> @@ -174,7 +174,8 @@ sub check_requierment ($$$$$$) {
>              }
>          }
>      }
> -    die "ERROR please correct the $errors error(s) below\n" if ($errors);
> +    die "ERROR please correct the $errors error".($errors>1?"s":"")." above.\n"
> +    	if ($errors);
>  }
>  
>  #check the directory structures, in theory not need, but well you never known!
> 
> Modified: trunk/tools-ng/r_pkg_prepare.sh
> URL: http://svn.debian.org/wsvn/pkg-bioc/trunk/tools-ng/r_pkg_prepare.sh?rev=355&op=diff
> ==============================================================================
> --- trunk/tools-ng/r_pkg_prepare.sh (original)
> +++ trunk/tools-ng/r_pkg_prepare.sh Mon Nov 12 18:35:04 2007
> @@ -32,6 +32,7 @@
>  # Be Warm that the name given here must match a pm file
>  # Are actually working : PBuilder CowBuilder
>  installMethods="CowBuilder"
> +#installMethods="PBuilder"
>  
>  ### END TO EDIT, START MODE READ-ONLY!!!
>  
> @@ -114,6 +115,11 @@ webdir="../web"
>  Lang=""
>  ### END - STUFF that we export - END ###
>  
> +if [ -x "/usr/bin/sudo" ] ; then
> +	echo "sudo is not installed which is required for both CowBuilder and PBuilder!"
> +	exit -1;
> +fi
> +
>  HELP=NO
>  EU=NO
>  US=NO