Mercurial > louis > mq > lightsd
changeset 447:4a125c65508f
fix decoding issues and remove extra whitespace
author | Louis Opter <kalessin@kalessin.fr> |
---|---|
date | Sat, 30 Apr 2016 19:51:23 -0700 |
parents | c63db2fc7500 |
children | 58257bd1b0e8 |
files | add_make_release.patch |
diffstat | 1 files changed, 9 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/add_make_release.patch Sat Apr 30 19:36:58 2016 -0700 +++ b/add_make_release.patch Sat Apr 30 19:51:23 2016 -0700 @@ -355,7 +355,7 @@ + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/dist/dpkg/debian/docs b/dist/dpkg/debian/docs new file mode 100644 --- /dev/null @@ -653,7 +653,7 @@ + +# main packaging script based on dh7 syntax +%: -+ dh $@ ++ dh $@ + +# debmake generated override targets +# This is example for Cmake (See http://bugs.debian.org/641051 ) @@ -1052,7 +1052,7 @@ new file mode 100644 --- /dev/null +++ b/dist/release.py.in -@@ -0,0 +1,546 @@ +@@ -0,0 +1,549 @@ +#!/usr/bin/env python3 + +import click @@ -1096,6 +1096,8 @@ + +FILE_READ_SIZE = 32768 + ++USER_ENCODING = locale.getpreferredencoding() ++ +TARBALL_COMPRESSORS = [ + # suffix, path, extra_flags + ("gz", GZIP_EXECUTABLE, ["--best"]), @@ -1342,17 +1344,17 @@ + revision, branch = [ + part.strip() for part in subprocess.check_output([ + HG_EXECUTABLE, "-R", LIGHTSD_SOURCE_DIR, "id", "--id", "--branch" -+ ]).split() ++ ]).decode(USER_ENCODING).split() + ] + qapplied = bool(len(subprocess.check_output([ + HG_EXECUTABLE, "-R", LIGHTSD_SOURCE_DIR, + "--config", "extensions.mq=", "qapplied" -+ ]))) ++ ]).decode(USER_ENCODING))) + if qapplied or revision.endswith("+") or branch != "default": + error_echo( + "Can't do a release over a dirty repository! " + "(rev={}, branch={}, patched={})".format( -+ revision.decode("utf-8"), branch.decode("utf-8"), qapplied ++ revision, branch, qapplied + ) + ) + sys.exit(1) @@ -1580,6 +1582,7 @@ + os.path.join(src_dir, "debian") + )) + dpkg_arch = subprocess.check_output(["dpkg", "--print-architecture"]) ++ dpkg_arch = dpkg_arch.decode(USER_ENCODING) + deb_pkg_name = "lightsd_{version}-{build_number}_{dpkg_arch}.deb".format( + version=version, + build_number=build_number,