Package: wanna-build
Version: 2004.02.23
Author: Guillem Jover <guillem@hadrons.org>
Status: not-sent
Description:
 wanna-build: Use config file from /etc instead of /org/wanna-build/etc.
 Added an arch variable to the config file.

diff -Naur wanna-build-apt/debian/changelog wanna-build.new/debian/changelog
--- wanna-build-apt/debian/changelog	2004-02-24 08:58:11.000000000 +0100
+++ wanna-build.new/debian/changelog	2004-08-27 13:59:18.000000000 +0200
@@ -1,3 +1,10 @@
+wanna-build (2004.08.27) unstable; urgency=low
+
+  * wanna-build: Use config file from /etc instead of /org/wanna-build/etc.
+  * Added an arch variable to the config file.
+
+ -- Guillem Jover <guillem@debian.org>  Fri, 27 Aug 2004 10:48:23 +0200
+
 wanna-build (2004.02.23) unstable; urgency=low
 
   * Initial non-release. [*DO NOT USE THESE DEBS*]
diff -Naur wanna-build-apt/do-merge-packages wanna-build.new/do-merge-packages
--- wanna-build-apt/do-merge-packages	2000-05-30 17:27:10.000000000 +0200
+++ wanna-build.new/do-merge-packages	2004-08-27 13:59:10.000000000 +0200
@@ -54,7 +54,9 @@
 print "-------------- merge-packages $date --------------\n";
 
 $tmpdir = "/tmp/merge-packages.$$";
-chomp( $arch = `dpkg --print-installation-architecture` );
+chomp( $arch = ($conf::arch ?
+	        $conf::arch :
+	        `dpkg --print-installation-architecture`));
 
 # make backups of databases
 my $d;
diff -Naur wanna-build-apt/do-merge-quinn wanna-build.new/do-merge-quinn
--- wanna-build-apt/do-merge-quinn	2000-05-30 17:27:22.000000000 +0200
+++ wanna-build.new/do-merge-quinn	2004-08-27 13:59:05.000000000 +0200
@@ -56,8 +56,9 @@
 print "-------------- merge-quinn $date --------------\n";
 
 $tmpdir = "/tmp/merge-quinn.$$";
-chomp( $arch = `dpkg --print-installation-architecture` );
-
+chomp( $arch = ($conf::arch ?
+	        $conf::arch :
+	        `dpkg --print-installation-architecture`));
 mkdir( $tmpdir, 0755 ) or die "mkdir $tmpdir: $!\n";
 chdir( $tmpdir ) or die "chdir $tmpdir: $!\n";
 
diff -Naur wanna-build-apt/wanna-build wanna-build.new/wanna-build
--- wanna-build-apt/wanna-build	2004-02-24 08:09:05.000000000 +0100
+++ wanna-build.new/wanna-build	2004-08-27 13:58:37.000000000 +0200
@@ -328,7 +328,7 @@
 $ignore_epochs = 0;
 $transactlog = "transactions.log";
 $mailprog = "/usr/lib/sendmail";
-require "/org/wanna-build/etc/wanna-build.conf";
+require "/etc/wanna-build.conf";
 die "$conf::basedir is not a directory\n" if ! -d $conf::basedir;
 die "dbbase is empty\n" if ! $dbbase;
 die "transactlog is empty\n" if ! $transactlog;
@@ -360,7 +360,10 @@
 chomp( $curr_date = `/bin/date '+%Y %b %d %H:%M:%S'` );
 chomp( $short_date = `/bin/date '+%m/%d/%y'` );
 chomp( $hostname = `/bin/hostname -f` );
-chomp( $my_arch = `/usr/bin/dpkg --print-installation-architecture` );
+chomp( $my_arch = ($conf::arch ?
+		   $conf::arch :
+		   `dpkg --print-installation-architecture`));
+
 $curr_date =~ /^(.*)$/; $curr_date = $1; # untaint
 $| = 1;