From 0c9da6a5ab8cdfe8283cebfbb7ea8fb751857e1d Mon Sep 17 00:00:00 2001
From: David Steele <david@pgmasters.net>
Date: Sat, 31 Jan 2015 15:06:53 -0500
Subject: [PATCH] Removed version file - redundant to the version in
 backup.manifest.

---
 INSTALL.md             | 14 +++++---------
 lib/BackRest/Backup.pm |  7 -------
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/INSTALL.md b/INSTALL.md
index fbf86768f..1efa12bd8 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -159,23 +159,19 @@ Expire (rotate) any backups that exceed the defined retention.  Expiration is ru
 
 ## structure
 
-PgBackRest stores files in a way that is easy for users to work with directly.  Each backup directory has two files and two subdirectories:
+PgBackRest stores files in a way that is easy for users to work with directly.  Each backup directory has one file and two subdirectories:
 
 1. `backup.manifest` file
 
 Stores information about all the directories, links, and files in the backup.  The file is plaintext and should be very clear, but documentation of the format is planned in a future release.
 
-2. `version` file
+2. `base` directory
 
-Contains the PgBackRest version that was used to create the backup.
+Contains the Postgres data directory as defined by the data_directory setting in `postgresql.conf`.
 
-3. `base` directory
+3. `tablespace` directory
 
-Contains the Postgres data directory as defined by the data_directory setting in postgresql.conf
-
-4. `tablespace` directory
-
-Contains each tablespace in a separate subdirectory.  The links in `base/pg_tblspc` are rewritten to this directory.
+If tablespaces are present in the database, contains each tablespace in a separate subdirectory.  Tablespace names are used for the subdirectories unless --no-start-stop is specified in which case oids will be used instead.  The links in `base/pg_tblspc` are rewritten to the tablespace directory in either case.
 
 ## restoring
 
diff --git a/lib/BackRest/Backup.pm b/lib/BackRest/Backup.pm
index 901838bb3..10f0564ba 100644
--- a/lib/BackRest/Backup.pm
+++ b/lib/BackRest/Backup.pm
@@ -699,7 +699,6 @@ sub backup_file_not_in_manifest
     {
         # Ignore certain files that will never be in the manifest
         if ($strName eq 'backup.manifest' ||
-            $strName eq 'version' ||
             $strName eq '.')
         {
             next;
@@ -1611,12 +1610,6 @@ sub backup
         $oFile->path_create(PATH_BACKUP_TMP);
     }
 
-    # Write the VERSION file
-    my $hVersionFile;
-    open($hVersionFile, '>', "${strBackupTmpPath}/" . FILE_VERSION) or confess 'unable to open version file';
-    print $hVersionFile version_get();
-    close($hVersionFile);
-
     # Save the backup manifest
     $oBackupManifest->save();