X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=bin%2Fwanna-build;h=8e205569d88720368beb00e276e82a2b1e44d2c8;hb=bd340c3494a3b6fa95cdfaab05f54b78962ff9e7;hp=fd814fb6daf4c8c194614f6c1ed2ef7ef2be52f9;hpb=9ca54a527dafb68b372a6a7375722fa837c6f186;p=wannabuild.git

diff --git a/bin/wanna-build b/bin/wanna-build
index fd814fb..8e20556 100755
--- a/bin/wanna-build
+++ b/bin/wanna-build
@@ -44,7 +44,7 @@ use WannaBuild;
 
 our ($verbose, $mail_logs, $list_order, $list_state,
     $curr_date, $op_mode, $user, $real_user, $distribution,
-    $fail_reason, $opt_override, $import_from, $opt_create_db,
+    $fail_reason, $opt_override, $import_from, $export_to, $opt_create_db,
     %prioval, %sectval,
     $info_all_dists, $arch,
     $category, %catval, %short_category,
@@ -181,6 +181,7 @@ my %options =
 							 $list_min_age *= -1;
 						 } },
 	 # special actions
+	 export         => { arg => \$export_to, mode => "export" },
 	 import         => { arg => \$import_from, mode => "import" },
 	 "manual-edit"  => { mode => "manual-edit" },
 	 );
@@ -250,7 +251,7 @@ if ($verbose) {
 	print "wanna-build $version for $distribution on $arch\n";
 }
 
-if (!@ARGV && !isin( $op_mode, qw(list merge-quinn merge-partial-quinn import 
+if (!@ARGV && !isin( $op_mode, qw(list merge-quinn merge-partial-quinn import export
 				  merge-packages manual-edit
 				  merge-sources))) {
 	warn "No packages given.\n";
@@ -302,7 +303,7 @@ END {
 }
 
 my $schema_suffix = '';
-if (isin( $op_mode, qw(list info)) && $distribution !~ /security/) {
+if (isin( $op_mode, qw(list info)) && $distribution !~ /security/ && !(not -t and $user =~ /-/)) {
 	$dbh = DBI->connect("DBI:Pg:service=wanna-build") || 
 		die "FATAL: Cannot open database: $DBI::errstr\n";
 	$schema_suffix = '_public';
@@ -417,6 +418,10 @@ sub process {
 			read_db( $import_from );
 			last SWITCH;
 		};
+		/^export/ && do {
+			export_db( $export_to );
+			last SWITCH;
+		};
 
 		die "Unexpected operation mode $op_mode\n";
 	}
@@ -1979,6 +1984,32 @@ sub check_entry {
 					 ) );
 }
 
+sub export_db {
+	my $file = shift;
+	my($name,$pkg,$key);
+
+	print "Writing ASCII database to $file..." if $verbose >= 1;
+	open( F, ">$file" ) or
+		die "Can't open export $file: $!\n";
+
+        my $db = get_all_source_info();
+        foreach $name (keys %$db) {
+		next if $name =~ /^_/;
+		my $pkg = $db->{$name};
+		foreach $key (keys %{$pkg}) {
+			my $val = $pkg->{$key};
+			next if !defined($val);
+			$val =~ s/\n*$//;
+			$val =~ s/^/ /mg;
+			$val =~ s/^ +$/ ./mg;
+			print F "$key: $val\n";
+		}
+		print F "\n";
+       }
+       close( F );
+       print "done\n" if $verbose >= 1;
+}
+
 sub change_state {
 	my $pkgr = shift;
 	my $pkg = $$pkgr;
@@ -2015,13 +2046,13 @@ sub log_ta {
 		   "changed from $prevstate to $pkg->{'state'} ".
 		   "by $real_user as $user";
 	
-	my $transactlog = db_transactlog();
-	if (!open( LOG, ">>$transactlog" )) {
-		warn "Can't open log file $transactlog: $!\n";
-		return;
-	}
-	print LOG "$curr_date: $str\n";
-	close( LOG );
+	$dbh->do('INSERT INTO ' . transactions_table_name() .
+			' (package, distribution, version, action, ' .
+			' prevstate, state, real_user, set_user, time) ' .
+			' values (?, ?, ?, ?, ?, ?, ?, ?, ?)',
+		undef, $pkg->{'package'}, $distribution,
+		$pkg->{'version'}, $action, $prevstate, $pkg->{'state'},
+		$real_user, $user, 'now()') or die $dbh->errstr;
 
 	if (!($prevstate eq 'Failed' && $pkg->{'state'} eq 'Failed')) {
 		$str .= " (with --override)"
@@ -2053,10 +2084,6 @@ sub send_mail {
 	close( PIPE );
 }
 
-sub db_transactlog {
-	return "$conf::basedir/$arch/$conf::transactlog";
-}
-
 # for parsing input to dep-wait
 sub parse_deplist {
     my $deps = shift;
@@ -2377,6 +2404,7 @@ Options:
         if -l is missing, set user name to be entered in db; usually
         automatically choosen
     --import FILE: Import database from a ASCII file FILE
+    --export FILE: Export database to a ASCII file FILE
 
 The remaining arguments (depending on operation) usually start with
 "name_version", the trailer is ignored. This allows to pass the names
@@ -2407,6 +2435,10 @@ sub user_table_name {
 	return '"' . $arch . $schema_suffix . '".users';
 }
 
+sub transactions_table_name {
+	return '"' . $arch . $schema_suffix . '".transactions';
+}
+
 sub get_readonly_source_info {
 	my $name = shift;
 	my $pkg = $dbh->selectrow_hashref('SELECT * FROM ' . 
@@ -2419,7 +2451,7 @@ sub get_source_info {
 	my $name = shift;
 	my $pkg = $dbh->selectrow_hashref('SELECT * FROM ' . 
 		table_name() . ' WHERE package = ? AND distribution = ?' .
-		'FOR UPDATE',
+		' FOR UPDATE',
 		undef, $name, $distribution);
 	return $pkg;
 }
@@ -2430,7 +2462,7 @@ sub get_all_source_info {
 	my $q = 'SELECT * FROM ' . table_name()
 		. ' WHERE distribution = ? ';
 	my @args = ($distribution);
-	if (uc($options{state}) ne "ALL") {
+	if ($options{state} && uc($options{state}) ne "ALL") {
 		$q .= ' AND upper(state) = ? ';
 		push @args, uc($options{state});
 	}