summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2005-10-25 06:33:28 +0000
committerbescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2005-10-25 06:33:28 +0000
commitf1b52b28ced38c2560e6682f2851e3db6e101945 (patch)
tree0ba5621cca40ad3b8cfd551afc8dc7001c0ec67b
parentfccecdfea7893a2c6db1040e59cf5907298fca3a (diff)
downloadrdiff-backup-f1b52b28ced38c2560e6682f2851e3db6e101945.tar.gz
Update the no-compression-regexp
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@656 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
-rw-r--r--rdiff-backup/CHANGELOG6
-rw-r--r--rdiff-backup/rdiff-backup.16
-rw-r--r--rdiff-backup/rdiff_backup/Globals.py5
3 files changed, 12 insertions, 5 deletions
diff --git a/rdiff-backup/CHANGELOG b/rdiff-backup/CHANGELOG
index 296d3b2..62a3e95 100644
--- a/rdiff-backup/CHANGELOG
+++ b/rdiff-backup/CHANGELOG
@@ -1,3 +1,9 @@
+New in v1.1.1 (????/??/??)
+--------------------------
+
+Applied Alec Berryman's patch to update the no-compression regexp.
+
+
New in v1.1.0 (2005/10/24)
--------------------------
diff --git a/rdiff-backup/rdiff-backup.1 b/rdiff-backup/rdiff-backup.1
index 019fa80..9fd3759 100644
--- a/rdiff-backup/rdiff-backup.1
+++ b/rdiff-backup/rdiff-backup.1
@@ -269,9 +269,9 @@ volume can contain compressed and uncompressed increments, so using
this option inconsistently is fine.
.TP
.B "--no-compression-regexp " regexp
-Do not compress increments based on files whose filenames match regexp.
-The default is
-"(?i).*\\.(gz|z|bz|bz2|tgz|zip|rpm|deb|jpg|gif|png|jp2|mp3|ogg|avi|wmv|mpeg|mpg|rm|mov)$"
+Do not compress increments based on files whose filenames match
+regexp. The default includes many common audiovisual and archive
+files, and may be found in Globals.py.
.TP
.B --no-file-statistics
This will disable writing to the file_statistics file in the
diff --git a/rdiff-backup/rdiff_backup/Globals.py b/rdiff-backup/rdiff_backup/Globals.py
index a0afe99..bfeab53 100644
--- a/rdiff-backup/rdiff_backup/Globals.py
+++ b/rdiff-backup/rdiff_backup/Globals.py
@@ -167,8 +167,9 @@ compression = 1
# case-insensitive regular expression won't be compressed (applies
# to .snapshots and .diffs). The second below will be the
# compiled version of the first.
-no_compression_regexp_string = "(?i).*\\.(gz|z|bz|bz2|tgz|zip|rpm|deb|" \
- "jpg|gif|png|jp2|mp3|ogg|avi|wmv|mpeg|mpg|rm|mov|flac|shn)$"
+no_compression_regexp_string = ("(?i).*\\.(gz|z|bz|bz2|tgz|zip|rpm|deb|"
+ "jpg|jpeg|gif|png|jp2|mp3|ogg|avi|wmv|mpeg|mpg|rm|mov|flac|shn|pgp|"
+ "gpg|rz|lzh|zoo|lharc|rar|arj|asc)$")
no_compression_regexp = None
# If true, filelists and directory statistics will be split on