[Piuparts-devel] [Git][debian/piuparts][develop] 3 commits: Revert "Create /dev/ptmx like debootstrap does"

[Holger Levsen]

Holger Levsen pushed to branch develop at Debian / piuparts


Commits:
84ef3d16 by Holger Levsen at 2018-10-17T08:49:58Z
Revert "Create /dev/ptmx like debootstrap does"

This reverts commit 0d5f8bbbb8e5368a932be1fe4816c8dd1c68ddcd.

- - - - -
491e4534 by Holger Levsen at 2018-10-17T08:50:05Z
Revert "Create /dev/ptmx like debootstrap does"

This reverts commit 09551876fc3387d425a77d5469513a5ae9b1f7ed.

- - - - -
e4f97760 by Holger Levsen at 2018-10-17T08:54:06Z
CONTRIBUTING: better explain how to contribute patches.

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


3 changed files:

- CONTRIBUTING
- debian/changelog
- piuparts.py


Changes:

=====================================
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 at 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()



View it on GitLab: https://salsa.debian.org/debian/piuparts/compare/0d5f8bbbb8e5368a932be1fe4816c8dd1c68ddcd...e4f977604662181a65195f9dc7cc8e8d0b40fb9b

-- 
View it on GitLab: https://salsa.debian.org/debian/piuparts/compare/0d5f8bbbb8e5368a932be1fe4816c8dd1c68ddcd...e4f977604662181a65195f9dc7cc8e8d0b40fb9b
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/piuparts-devel/attachments/20181017/c9074c57/attachment-0001.html>