aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--BCD/Common.pm7
-rw-r--r--BCD/Web.pm4
-rw-r--r--doc/conf.xml.pod3
-rw-r--r--doc/conf.xml.tex5
4 files changed, 15 insertions, 4 deletions
diff --git a/BCD/Common.pm b/BCD/Common.pm
index df200b5..c5a71ae 100644
--- a/BCD/Common.pm
+++ b/BCD/Common.pm
@@ -12,7 +12,7 @@ use BCD::Bcd qw(:DEFAULT);
our @ISA = qw(Exporter);
our @EXPORT = qw(create_needed_dir check_dir clean_all print_color);
# export all needed var
-our @EXPORT_OK = qw($isoconf $wd $name $arch $file $based_on $version $repo $isodir $builddir $distrib_path $error_color $DISTRIB $THEME $tmp_rpmsrate $NB_FORK $dir_deps @list_of_removed $rpmrc $pwd_file $conf_file $date);
+our @EXPORT_OK = qw($isoconf $wd $name $arch $file $based_on $version $repo $isodir $builddir $distrib_path $error_color $DISTRIB $THEME $tmp_rpmsrate $NB_FORK $dir_deps @list_of_removed $rpmrc $pwd_file $conf_file $date $urpmqlogs);
my $LOG="COMMON -";
my $color = "red";
@@ -64,7 +64,10 @@ our $pwd_file = $isoconf->{signature};
our $rpmrc = $isoconf->{rpmrc};
# where to store urpmq queries results
-our $dir_deps = "/var/lib/bcd/$name-$version-$arch";
+my $urpmqlogs;
+$isoconf->{urpmqlogs} and $urpmqlogs=$isoconf->{urpmqlogs} or $urpmqlogs="/var/lib/bcd/";
+create_needed_dir($urpmqlogs);
+our $dir_deps = "$urpmqlogs/$name-$version-$arch";
our $builddir = "$wd/$isoconf->{iso}{genisoimage}{builddir}/$name-$version-$arch/$arch";
our $isodir = "$wd/$isoconf->{iso}{genisoimage}{isodir}/$name-$version-$arch";
# distrib path in chroot (mounted loop)
diff --git a/BCD/Web.pm b/BCD/Web.pm
index 235e375..f5630f6 100644
--- a/BCD/Web.pm
+++ b/BCD/Web.pm
@@ -7,7 +7,7 @@ use URPM;
use File::Slurp;
use MDK::Common;
-use BCD::Common qw(:DEFAULT $isoconf $isodir $wd $arch $version $based_on $repo $THEME $name $conf_file $date);
+use BCD::Common qw(:DEFAULT $isoconf $isodir $wd $arch $version $based_on $repo $THEME $name $conf_file $date $urpmqlogs);
our @ISA = qw(Exporter);
our @EXPORT = qw(main_html);
@@ -161,7 +161,7 @@ Pubkey: $media->{pubkey}
}
sub prep_build_log {
- system("cp -af /var/lib/bcd/$name-$version-$arch/* $webdir/log/");
+ system("cp -af $urpmqlogs/$name-$version-$arch/* $webdir/log/");
}
sub show_rpmcheck {
diff --git a/doc/conf.xml.pod b/doc/conf.xml.pod
index 063f1e3..c404c7f 100644
--- a/doc/conf.xml.pod
+++ b/doc/conf.xml.pod
@@ -39,6 +39,9 @@ This parameter define if we need synthesis or hdlists (since 2009.1 only synthes
It will be use to get the path of the Mandriva repositery
<based_on>2009.0</based_on>
+urpmqlogs paramater define the directory to store previous urpmq queries, if not defined the system will use the /var/lib/bcd dir.
+ <urpmqlogs>/home/plop/urpmqlogs</urpmqlogs>
+
Arch parameter is mandatory, it will be also used to get the path of the MDV repositery
<arch>i586</arch>
diff --git a/doc/conf.xml.tex b/doc/conf.xml.tex
index f512179..613d0e3 100644
--- a/doc/conf.xml.tex
+++ b/doc/conf.xml.tex
@@ -52,6 +52,11 @@ It will be use to get the path of the Mandriva repositery.
<based_on>2009.0</based_on>
\end{verbatim}
+urpmqlogs paramater define the directory to store previous urpmq queries, if not defined the system will use the /var/lib/bcd dir.
+\begin{verbatim}
+<urpmqlogs>/home/plop/urpmqlogs</urpmqlogs>
+\end{verbatim}
+
Arch parameter is mandatory, it will be also used to get the path of the Mandriva repositery
\begin{verbatim}
<arch>i586</arch>