[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[dak/master] Use --no-name for all gzip calls



That doesn't store original name/timestamp, with the latter meaning a
change even if there wasn't one in the input. Ought to help systems like
snapshot.
---
 config/debian/dinstall.functions | 8 ++++----
 config/debian/vars               | 2 +-
 dak/generate_index_diffs.py      | 2 +-
 daklib/filewriter.py             | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)
 mode change 100644 => 100755 daklib/filewriter.py

diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions
index 34f238a..ed749b6 100755
--- a/config/debian/dinstall.functions
+++ b/config/debian/dinstall.functions
@@ -264,7 +264,7 @@ function mklslar() {
 
         log "Creating recursive directory listing ... "
         rm -f ${FILENAME}.gz
-        TZ=UTC ls -lR | gzip -9c --rsyncable > ${FILENAME}.gz
+        TZ=UTC ls -lR | gzip -9c --rsyncable --no-name > ${FILENAME}.gz
     done
 }
 
@@ -283,8 +283,8 @@ function mkmaintainers() {
         cd "${indices}"
 
         dak make-maintainers -a "${archive}" ${scriptdir}/masterfiles/pseudo-packages.maintainers
-        gzip -9v --rsyncable <Maintainers >Maintainers.gz
-        gzip -9v --rsyncable <Uploaders >Uploaders.gz
+        gzip -9v --rsyncable  --no-name <Maintainers >Maintainers.gz
+        gzip -9v --rsyncable  --no-name <Uploaders >Uploaders.gz
     done
 }
 
@@ -295,7 +295,7 @@ function copyoverrides() {
         shopt -s nullglob
         for ofile in ${overridedir}/override.{squeeze,wheezy,jessie,stretch,sid}.{,extra.}{main,contrib,non-free}*; do
             bname=${ofile##*/}
-            gzip -9cv --rsyncable ${ofile} > ${indices}/${bname}.gz
+            gzip -9cv --rsyncable  --no-name ${ofile} > ${indices}/${bname}.gz
             chmod g+w ${indices}/${bname}.gz
         done
     )
diff --git a/config/debian/vars b/config/debian/vars
index 9c128b7..208ff8c 100644
--- a/config/debian/vars
+++ b/config/debian/vars
@@ -2,7 +2,7 @@
 
 umask 022
 unset CDPATH
-GZIP='--rsyncable' ; export GZIP
+GZIP='--rsyncable --no-name' ; export GZIP
 
 # locations used by many scripts
 base=/srv/ftp-master.debian.org
diff --git a/dak/generate_index_diffs.py b/dak/generate_index_diffs.py
index 485d377..06d6a21 100755
--- a/dak/generate_index_diffs.py
+++ b/dak/generate_index_diffs.py
@@ -319,7 +319,7 @@ def genchanges(Options, outdir, oldfile, origfile, maxdiffs = 56):
         if not os.path.isdir(outdir):
             os.mkdir(outdir)
 
-        w = os.popen("diff --ed - %s | gzip --rsyncable -c -9 > %s.gz" %
+        w = os.popen("diff --ed - %s | gzip --rsyncable  --no-name -c -9 > %s.gz" %
                      (newfile, difffile), "w")
         pipe_file(oldf, w)
         oldf.close()
diff --git a/daklib/filewriter.py b/daklib/filewriter.py
old mode 100644
new mode 100755
index 5824530..94a2fc9
--- a/daklib/filewriter.py
+++ b/daklib/filewriter.py
@@ -40,7 +40,7 @@ class CompressionMethod(object):
 
 _compression_methods = (
     CompressionMethod('bzip2', '.bz2', ['bzip2', '-9']),
-    CompressionMethod('gzip', '.gz', ['gzip', '-9cn', '--rsyncable']),
+    CompressionMethod('gzip', '.gz', ['gzip', '-9cn', '--rsyncable', '--no-name']),
     CompressionMethod('xz', '.xz', ['xz', '-c']),
     # 'none' must be the last compression method as BaseFileWriter
     # handling it will remove the input file for other compressions
-- 
2.1.4


Reply to: