[reprotest] 01/02: Update docs, update changelog, bump version

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository reprotest.

commit 4111e7d727728c12933f9ccfcf8fef610bfca378
Author: Ximin Luo <infinity0 at debian.org>
Date:   Tue Oct 3 19:23:58 2017 +0200

    Update docs, update changelog, bump version
---
 README.rst           | 21 ++++++++++++---------
 debian/changelog     |  7 +++++++
 reprotest/presets.py |  7 ++++---
 setup.py             |  2 +-
 4 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/README.rst b/README.rst
index aebef9a..18a7e58 100644
--- a/README.rst
+++ b/README.rst
@@ -79,9 +79,10 @@ directory" preset would look like, if we ran it using the full CLI::
     $ reprotest \
         --testbed-init 'apt-get -y --no-install-recommends install \
                         disorderfs faketime locales-all sudo util-linux; \
-                        test -c /dev/fuse || mknod -m 666 /dev/fuse c 10 229' \
-        --build-command 'PATH=/sbin:/usr/sbin:$PATH apt-get -y --no-install-recommends build-dep ./; \
-                         dpkg-buildpackage -uc -us -b' \
+                        test -c /dev/fuse || mknod -m 666 /dev/fuse c 10 229; \
+                        test -f /etc/mtab || ln -s ../proc/self/mounts /etc/mtab' \
+        --testbed-build-pre 'apt-get -y --no-install-recommends build-dep ./' \
+        --build-command 'dpkg-buildpackage --no-sign -b' \
         . \
         '../*.deb' \
         -- \
@@ -92,9 +93,9 @@ reprotest needs in order to make the variations in the first place. This
 should be the same regardless of what package is being built, but might
 differ depending on what virtual\_server is being used.
 
-Next, we have ``--build-command`` (or ``-c``). For our Debian directory, we
-install build-dependencies using ``apt-get``, then we run the actual build
-command itself using ``dpkg-buildpackage(1)``.
+Next, we have ``--testbed-build-pre``, then ``--build-command`` (or ``-c``).
+For our Debian directory, we install build-dependencies using ``apt-get``,
+then we run the actual build command itself using ``dpkg-buildpackage(1)``.
 
 Then, we have the ``source_root`` and the ``artifact_pattern``. For
 reproducibility, we're only interested in the binary packages.
@@ -103,8 +104,8 @@ Finally, we specify that this is to take place in the "schroot"
 virtual\_server with arguments "unstable-amd64-sbuild".
 
 Of course, all of this is a burden to remember, if you must run the same
-thing many times. So that is why adding new presets for new files would
-be good.
+thing many times. So that is why adding new presets for new package types
+would be good.
 
 Here is a more complex example. It tells reprotest to store the build products
 into ``./artifacts`` to analyse later; and also tweaks the "Debian dsc" preset
@@ -120,7 +121,9 @@ so that it uses our `experimental toolchain
         -- \
         schroot unstable-amd64-sbuild
 
-(Yes, this could be a lot nicer to achieve; we're working on it.)
+Alternatively, you can clone your unstable-amd64-sbuild chroot, add our repo to
+the cloned chroot, then use this chroot in place of "unstable-amd64-sbuild".
+That would allow you to omit the long ``--auto-preset-expr`` flag above.
 
 
 Config File
diff --git a/debian/changelog b/debian/changelog
index 9942e93..bc3d47f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+reprotest (0.7.2) UNRELEASED; urgency=medium
+
+  * Various bug fixes to get the basic dsc+schroot example working.
+  * Improve the dsc+schroot preset to run builds as non-root.
+
+ -- Ximin Luo <infinity0 at debian.org>  Tue, 03 Oct 2017 19:21:28 +0200
+
 reprotest (0.7.1) unstable; urgency=medium
 
   * New features:
diff --git a/reprotest/presets.py b/reprotest/presets.py
index 1f3cbe1..413bae0 100644
--- a/reprotest/presets.py
+++ b/reprotest/presets.py
@@ -58,7 +58,7 @@ class ReprotestPreset(collections.namedtuple('_ReprotestPreset',
 
     @property
     def re_replace(self):
-        """Do a substring-replace on the given attribute."""
+        """Do a regex-replace on the given attribute."""
         return AttributeFunctor(self, lambda s, pattern, repl, **kwargs: re.sub(pattern, repl, s, **kwargs))
 
 
@@ -84,9 +84,10 @@ def preset_deb_schroot(fn, preset):
     ).set.testbed_init(
         # need to symlink /etc/mtab to work around a fusermount(1) deficiency
         'apt-get -y --no-install-recommends install disorderfs faketime locales-all sudo util-linux; \
-        test -c /dev/fuse || mknod -m 666 /dev/fuse c 10 229; test -f /etc/mtab || ln -s ../proc/self/mounts /etc/mtab'
+        test -c /dev/fuse || mknod -m 666 /dev/fuse c 10 229; \
+        test -f /etc/mtab || ln -s ../proc/self/mounts /etc/mtab'
     ).set.testbed_build_pre(
-        'PATH=/sbin:/usr/sbin:$PATH apt-get -y --no-install-recommends build-dep ./"%s"' % fn)
+        'apt-get -y --no-install-recommends build-dep ./"%s"' % fn)
 
 def parse_dsc_aux(path):
     dscfiles = subprocess.check_output(["egrep",
diff --git a/setup.py b/setup.py
index 9dece1e..51ef252 100644
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@
 from setuptools import setup, find_packages
 
 setup(name='reprotest',
-      version='0.7.1',
+      version='0.7.2',
       description='Build packages and check them for reproducibility.',
       long_description=open('README.rst', encoding='utf-8').read(),
       author='Ceridwen',

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/reprotest.git