From 2d5809955756b42884e0051733dab2a128b9faf4 Mon Sep 17 00:00:00 2001 From: Don Armstrong Date: Sat, 12 Sep 2020 12:58:48 -0700 Subject: [PATCH] complete documentation for --upgrade --- bin/debbugs-installsql | 7 ++++++- lib/Debbugs/DB/Util.pm | 3 --- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/bin/debbugs-installsql b/bin/debbugs-installsql index ed407eb..d2aa7a9 100755 --- a/bin/debbugs-installsql +++ b/bin/debbugs-installsql @@ -43,7 +43,8 @@ environmental variable (which this option overrides). =item B<--deployment-dir> -Deployment directory (defaults to /usr/share/debbugs/sql/upgrade) +Deployment directory (defaults to /usr/share/debbugs/sql/). This directory +contains an upgrade subdirectory and scripts which perform the upgrade =item B<--debug, -d> @@ -163,6 +164,10 @@ if ($options{current_version}) { } } } elsif ($options{install_version_storage}) { + if ($s->db_version > 1) { + print STDERR "Version storage is already installed, current version is > 1\n"; + exit 1; + } # TODO Check if db_version already exists, and error out $s->sql_file_in_txn($options{deployment_dir}.'/version_storage.sql'); } diff --git a/lib/Debbugs/DB/Util.pm b/lib/Debbugs/DB/Util.pm index 0a07287..e2b8b63 100644 --- a/lib/Debbugs/DB/Util.pm +++ b/lib/Debbugs/DB/Util.pm @@ -136,13 +136,10 @@ sub upgrades_to_run { $deployment_dir ); # sort the upgrades - use Data::Dumper; - print STDERR Dumper(@files); @files = sort {$a->{from} <=> $b->{from}} # strip out upgrades which don't need to be run grep {$_->{from} >= $current_version } @files; - print STDERR Dumper(@files); return @files; } -- 2.39.2