summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgerv%gerv.net <>2002-07-25 08:32:41 +0200
committergerv%gerv.net <>2002-07-25 08:32:41 +0200
commit0e3c836ce8de548bec6550f27b49f5c8fbcbc6e2 (patch)
treec36e56eb9d7735a8cf8c288124685b3c1c86c663
parentf71149e1af4ac0b03678fc80da73a7cdc352c3aa (diff)
downloadbugzilla-0e3c836ce8de548bec6550f27b49f5c8fbcbc6e2.tar.gz
bugzilla-0e3c836ce8de548bec6550f27b49f5c8fbcbc6e2.tar.xz
Bug 67950b - quick fixes. Patch by gerv.
-rwxr-xr-xchecksetup.pl17
1 files changed, 8 insertions, 9 deletions
diff --git a/checksetup.pl b/checksetup.pl
index 5b504dea9..5a522643d 100755
--- a/checksetup.pl
+++ b/checksetup.pl
@@ -3025,17 +3025,17 @@ if (!GetFieldDef("bugs", "alias")) {
# Move quips to the db.
my $renamed_comments_file = 0;
if (GetFieldDef("quips", "quipid")) {
- if (-s 'data/comments' && open (COMMENTS, "<data/comments")) {
+ if (-e 'data/comments' && open (COMMENTS, "<data/comments")) {
print "Populating quips table from data/comments...\n";
while (<COMMENTS>) {
chomp;
$dbh->do("INSERT INTO quips (quip) VALUES ("
. $dbh->quote($_) . ")");
}
- print "The data/comments file (used to store quips) has been
-copied into the database, and the data/comments file
-moved to data/comments.bak - you can delete this file
-once you're satisfied the migration worked correctly.\n";
+ print "The data/comments file (used to store quips) has been
+ copied into the database, and the data/comments file
+ moved to data/comments.bak - you can delete this file
+ once you're satisfied the migration worked correctly.\n\n";
close COMMENTS;
rename("data/comments", "data/comments.bak") or next;
$renamed_comments_file = 1;
@@ -3043,11 +3043,10 @@ once you're satisfied the migration worked correctly.\n";
}
# Warn if data/comments.bak exists, as it should be deleted.
-if (-s 'data/comments.bak' && !$renamed_comments_file) {
- print "Please note the data/comments.bak file can be removed as it's
-no longer used.\n";
+if (-e 'data/comments.bak' && !$renamed_comments_file) {
+ print "The data/comments.bak file can be removed, as it's no longer
+ used.\n\n";
}
-
# If you had to change the --TABLE-- definition in any way, then add your
# differential change code *** A B O V E *** this comment.