CONTRIBUTING

@@ -24,6 +24,18 @@ One possible workflow:
   reportbug piuparts
   <describe the issue, attach the patch>
 
+
+Does and don'ts
+---------------
+
+Please do *not* push to the develop or master branch directly, unless
+explicitly asked for!
+
+Please always *do* include a debian/changelog entry with your patches.
+
+Please always *do* test your patches and state that you tested them.
+
+
 Contributing bugs to other projects
 -----------------------------------
 Another very useful type of contributions are filing bug reports based

debian/changelog

@@ -35,6 +35,9 @@ piuparts (0.93) UNRELEASED; urgency=medium
       exists since 2005 (even though that FQDN is younger).
     - Minor cleanups.
   * Use the new debhelper-compat(=11) notation and drop d/compat.
+  * CONTRIBUTING: explain never to directly push to the develop nor master
+    branch. Explain to always include a debian/changelog entry with patches.
+    Explain to always test patches and to explain that testing has happened.
 
  -- Holger Levsen <holger@debian.org>  Sat, 22 Sep 2018 15:32:55 +0200
 

piuparts.py

@@ -1755,11 +1755,11 @@ class Chroot:
             os.symlink("../proc/mounts", etcmtab)
         self.mount("devpts", "/dev/pts", fstype="devpts", opts="newinstance,noexec,nosuid,gid=5,mode=0620,ptmxmode=0666")
         dev_ptmx_rel_path = self.relative("dev/ptmx")
-        if not os.path.exists(dev_ptmx_rel_path):
-            try:
-                os.mknod(dev_ptmx_rel_path, 0666 | stat.S_IFCHR, os.makedev(5, 2))
-            except:
-                os.symlink("pts/ptmx", dev_ptmx_rel_path)
+        if not os.path.islink(dev_ptmx_rel_path):
+            if not os.path.exists(dev_ptmx_rel_path):
+                with open(dev_ptmx_rel_path, 'w'):
+                    pass
+            self.mount(self.relative("dev/pts/ptmx"), "/dev/ptmx", opts="bind", no_mkdir=True)
         p = subprocess.Popen(["tty"], stdout=subprocess.PIPE)
         stdout, _ = p.communicate()
         current_tty = stdout.strip()