[Python-apps-commits] r11107 - in packages/s3ql/trunk/debian (9 files)
nikratio-guest at users.alioth.debian.org
nikratio-guest at users.alioth.debian.org
Mon Aug 4 04:19:38 UTC 2014
Date: Monday, August 4, 2014 @ 04:19:35
Author: nikratio-guest
Revision: 11107
* New upstream release.
* Dropped patches (integrated upstream):
- C_locale_compat.diff
- kfreebsd_compat.diff
- sphinx_build_locale_fix.diff
Modified:
packages/s3ql/trunk/debian/NEWS
packages/s3ql/trunk/debian/changelog
packages/s3ql/trunk/debian/patches/check_dev_fuse_perms.diff
packages/s3ql/trunk/debian/patches/clock-granularity.diff
packages/s3ql/trunk/debian/patches/series
packages/s3ql/trunk/debian/s3ql.docs
Deleted:
packages/s3ql/trunk/debian/patches/C_locale_compat.diff
packages/s3ql/trunk/debian/patches/kfreebsd_compat.diff
packages/s3ql/trunk/debian/patches/sphinx_build_locale_fix.diff
Modified: packages/s3ql/trunk/debian/NEWS
===================================================================
--- packages/s3ql/trunk/debian/NEWS 2014-08-03 12:48:28 UTC (rev 11106)
+++ packages/s3ql/trunk/debian/NEWS 2014-08-04 04:19:35 UTC (rev 11107)
@@ -1,3 +1,17 @@
+s3ql (2.10.1+dfsg-1) UNRELEASED; urgency=medium
+
+ The internal file system revision has changed. File systems created
+ with S3QL 2.10 or newer are not compatible with prior S3QL
+ versions. To update an existing file system to the newest revision,
+ use the 's3qladm upgrade' command.
+
+ It is strongly recommended to run the (new) s3ql_verify command with
+ the --data option at shortly after the upgrade. This is necessary to
+ ensure that the upgrade to the next (2.11) S3QL release will run
+ smoothly.
+
+ -- Nikolaus Rath <Nikolaus at rath.org> Sun, 03 Aug 2014 20:49:06 -0700
+
s3ql (2.5-1) unstable; urgency=low
* The file system structure has changed, existing file systems
Modified: packages/s3ql/trunk/debian/changelog
===================================================================
--- packages/s3ql/trunk/debian/changelog 2014-08-03 12:48:28 UTC (rev 11106)
+++ packages/s3ql/trunk/debian/changelog 2014-08-04 04:19:35 UTC (rev 11107)
@@ -1,9 +1,14 @@
-s3ql (2.9+dfsg-3) UNRELEASED; urgency=medium
+s3ql (2.10.1+dfsg-1) UNRELEASED; urgency=medium
* Made system clock resolution heuristic in unittests even more
conservative, there are still occasional build failures on i386.
+ * New upstream release.
+ * Dropped patches (integrated upstream):
+ - C_locale_compat.diff
+ - kfreebsd_compat.diff
+ - sphinx_build_locale_fix.diff
- -- Nikolaus Rath <Nikolaus at rath.org> Sun, 20 Jul 2014 12:13:22 -0700
+ -- Nikolaus Rath <Nikolaus at rath.org> Sun, 03 Aug 2014 20:49:06 -0700
s3ql (2.9+dfsg-2) unstable; urgency=medium
Deleted: packages/s3ql/trunk/debian/patches/C_locale_compat.diff
===================================================================
--- packages/s3ql/trunk/debian/patches/C_locale_compat.diff 2014-08-03 12:48:28 UTC (rev 11106)
+++ packages/s3ql/trunk/debian/patches/C_locale_compat.diff 2014-08-04 04:19:35 UTC (rev 11107)
@@ -1,17 +0,0 @@
-Description: Fix unit test failure under C locale
-Origin: https://bitbucket.org/nikratio/s3ql/commits/f6c1d2d91f59
-Forwarded: not-needed
-Last-Update: <2014-07-19>
-Author: Nikolaus Rath <Nikolaus at rath.org>
-
---- a/tests/common.py
-+++ b/tests/common.py
-@@ -224,7 +233,7 @@
- file_sizes.append(int(0.5 * size))
-
- # Special characters for use in filenames
-- special_chars = [ chr(x) for x in range(256)
-+ special_chars = [ chr(x) for x in range(128)
- if x not in (0, ord('/')) ]
-
- def random_name(path):
Modified: packages/s3ql/trunk/debian/patches/check_dev_fuse_perms.diff
===================================================================
--- packages/s3ql/trunk/debian/patches/check_dev_fuse_perms.diff 2014-08-03 12:48:28 UTC (rev 11106)
+++ packages/s3ql/trunk/debian/patches/check_dev_fuse_perms.diff 2014-08-04 04:19:35 UTC (rev 11107)
@@ -11,9 +11,9 @@
--- a/tests/common.py
+++ b/tests/common.py
-@@ -173,6 +173,13 @@
- except subprocess.CalledProcessError:
- raise unittest.SkipTest('Unable to execute fusermount') from None
+@@ -182,6 +182,13 @@
+ else:
+ os.close(fd)
+ try:
+ fd = os.open('/dev/fuse', os.O_RDWR)
Modified: packages/s3ql/trunk/debian/patches/clock-granularity.diff
===================================================================
--- packages/s3ql/trunk/debian/patches/clock-granularity.diff 2014-08-03 12:48:28 UTC (rev 11106)
+++ packages/s3ql/trunk/debian/patches/clock-granularity.diff 2014-08-04 04:19:35 UTC (rev 11107)
@@ -1,7 +1,7 @@
Description: Estimate system clock granularity more conservatively
Origin: debian
Forwarded: no
-Last-Update: <2014-07-20>
+Last-Update: <2014-08-03>
Author: Nikolaus Rath <Nikolaus at rath.org>
Some unit tests check that file access time stamps are updated
@@ -11,14 +11,14 @@
e.g. the i386 buildd, so we make it much more conservative. This
means the test suite runs longer, but otherwise has no ill effects.
---- a/tests/t3_fs_api.py
-+++ b/tests/t3_fs_api.py
-@@ -49,7 +49,7 @@
- stamp2 = stamp1
- while stamp1 == stamp2:
- stamp2 = time.time()
--CLOCK_GRANULARITY = 2 * (stamp2 - stamp1)
-+CLOCK_GRANULARITY = max(1, 10 * (stamp2 - stamp1))
- del stamp1
- del stamp2
+--- a/tests/common.py
++++ b/tests/common.py
+@@ -29,7 +29,7 @@
+ stamp2 = stamp1
+ while stamp1 == stamp2:
+ stamp2 = time.time()
+- return 2 * (stamp2 - stamp1)
++ return max(1, 10 * (stamp2 - stamp1))
+ CLOCK_GRANULARITY = get_clock_granularity()
+ @contextmanager
Deleted: packages/s3ql/trunk/debian/patches/kfreebsd_compat.diff
===================================================================
--- packages/s3ql/trunk/debian/patches/kfreebsd_compat.diff 2014-08-03 12:48:28 UTC (rev 11106)
+++ packages/s3ql/trunk/debian/patches/kfreebsd_compat.diff 2014-08-04 04:19:35 UTC (rev 11107)
@@ -1,17 +0,0 @@
-Description: Fix unit test failure under kFreeBSD
-Origin: https://bitbucket.org/nikratio/s3ql/commits/412b308e4d33
-Forwarded: not-needed
-Last-Update: <2014-07-19>
-Author: Nikolaus Rath <Nikolaus at rath.org>
-
---- a/tests/mock_server.py
-+++ b/tests/mock_server.py
-@@ -80,7 +80,7 @@
- pass
- else:
- raise
-- except BrokenPipeError:
-+ except (BrokenPipeError, ConnectionResetError):
- pass
-
- def do_DELETE(self):
Modified: packages/s3ql/trunk/debian/patches/series
===================================================================
--- packages/s3ql/trunk/debian/patches/series 2014-08-03 12:48:28 UTC (rev 11106)
+++ packages/s3ql/trunk/debian/patches/series 2014-08-04 04:19:35 UTC (rev 11107)
@@ -1,6 +1,3 @@
proc_mount.diff
clock-granularity.diff
-sphinx_build_locale_fix.diff
check_dev_fuse_perms.diff
-C_locale_compat.diff
-kfreebsd_compat.diff
Deleted: packages/s3ql/trunk/debian/patches/sphinx_build_locale_fix.diff
===================================================================
--- packages/s3ql/trunk/debian/patches/sphinx_build_locale_fix.diff 2014-08-03 12:48:28 UTC (rev 11106)
+++ packages/s3ql/trunk/debian/patches/sphinx_build_locale_fix.diff 2014-08-04 04:19:35 UTC (rev 11107)
@@ -1,119 +0,0 @@
-Description: Make documentation building locale-independent
-Origin: https://bitbucket.org/nikratio/s3ql/commits/4c3050faf0bcc7613545288ab940805ad9608b65
-Forwarded: not-needed
-Last-Update: <2014-06-29>
-Author: Nikolaus Rath <Nikolaus at rath.org>
-
-This patch has been cherry picked from upstream, and makes sure
-that the documentation can be build even if the system has unusal
-locale setting.
-
---- a/util/sphinx_pipeinclude.py
-+++ b/util/sphinx_pipeinclude.py
-@@ -13,7 +13,8 @@
- from docutils.parsers.rst.directives.misc import Include
- import subprocess
- import shlex
--from docutils import io, nodes, statemachine
-+from docutils.utils.error_reporting import SafeString
-+import tempfile
- import os.path
- import sys
-
-@@ -23,6 +24,10 @@
- """
-
- def run(self):
-+ # To maximize code reuse, we just write the output in a temporary
-+ # file and call the base class. Otherwise we'd have to copy & paste
-+ # all the code to handle start-line, end-line etc options.
-+
- source = self.state_machine.input_lines.source(
- self.lineno - self.state_machine.input_offset - 1)
- source_dir = os.path.dirname(os.path.abspath(source))
-@@ -33,74 +38,17 @@
- if command_list[0] == 'python':
- command_list[0] = sys.executable
-
-- encoding = self.options.get(
-- 'encoding', self.state.document.settings.input_encoding)
-- tab_width = self.options.get(
-- 'tab-width', self.state.document.settings.tab_width)
--
-- try:
-- child = subprocess.Popen(command_list, stdout=subprocess.PIPE,
-- cwd=source_dir, universal_newlines=True)
-- include_file = io.FileInput(
-- source=child.stdout, encoding=encoding,
-- error_handler=(self.state.document.settings.\
-- input_encoding_error_handler),
-- handle_io_errors=None)
-- except IOError as error:
-- raise self.severe('Problems with "%s" directive path:\n%s: %s.' %
-- (self.name, error.__class__.__name__, str(error)))
-- # Hack: Since Python 2.6, the string interpolation returns a
-- # unicode object if one of the supplied %s replacements is a
-- # unicode object. IOError has no `__unicode__` method and the
-- # fallback `__repr__` does not report the file name. Explicitely
-- # converting to str fixes this for now::
-- # print '%s\n%s\n%s\n' %(error, str(error), repr(error))
-- startline = self.options.get('start-line', None)
-- endline = self.options.get('end-line', None)
-- try:
-- if startline or (endline is not None):
-- include_lines = include_file.readlines()
-- include_text = ''.join(include_lines[startline:endline])
-- else:
-- include_text = include_file.read()
-- except UnicodeError as error:
-- raise self.severe(
-- 'Problem with "%s" directive:\n%s: %s'
-- % (self.name, error.__class__.__name__, error))
-- # start-after/end-before: no restrictions on newlines in match-text,
-- # and no restrictions on matching inside lines vs. line boundaries
-- after_text = self.options.get('start-after', None)
-- if after_text:
-- # skip content in include_text before *and incl.* a matching text
-- after_index = include_text.find(after_text)
-- if after_index < 0:
-- raise self.severe('Problem with "start-after" option of "%s" '
-- 'directive:\nText not found.' % self.name)
-- include_text = include_text[after_index + len(after_text):]
-- before_text = self.options.get('end-before', None)
-- if before_text:
-- # skip content in include_text after *and incl.* a matching text
-- before_index = include_text.find(before_text)
-- if before_index < 0:
-- raise self.severe('Problem with "end-before" option of "%s" '
-- 'directive:\nText not found.' % self.name)
-- include_text = include_text[:before_index]
-- if 'literal' in self.options:
-- # Convert tabs to spaces, if `tab_width` is positive.
-- if tab_width >= 0:
-- text = include_text.expandtabs(tab_width)
-- else:
-- text = include_text
-- literal_block = nodes.literal_block(include_text, text,
-- source=command)
-- literal_block.line = 1
-- return [literal_block]
-- else:
-- include_lines = statemachine.string2lines(
-- include_text, tab_width, convert_whitespace=1)
-- self.state_machine.insert_input(include_lines, command)
-- return []
--
-+ with tempfile.NamedTemporaryFile() as fh:
-+ exitcode = subprocess.call(command_list, stdout=fh,
-+ cwd=source_dir)
-+ if exitcode != 0:
-+ raise self.severe('Problems with "%s" directive:\n'
-+ 'Command %s returned with exit code %d' %
-+ (self.name, SafeString(command), exitcode))
-+
-+ fh.flush()
-+ self.arguments[0] = fh.name
-+ return super().run()
-
- def setup(app):
- app.add_directive('pipeinclude', PipeInclude)
Modified: packages/s3ql/trunk/debian/s3ql.docs
===================================================================
--- packages/s3ql/trunk/debian/s3ql.docs 2014-08-03 12:48:28 UTC (rev 11106)
+++ packages/s3ql/trunk/debian/s3ql.docs 2014-08-04 04:19:35 UTC (rev 11107)
@@ -1,3 +1,2 @@
doc/html/
doc/manual.pdf
-CREDITS.txt
More information about the Python-apps-commits
mailing list