[Piuparts-devel] [Git][debian/piuparts][develop] 2 commits: debiman-piuparts-distill: also consider --install

[Holger Levsen]

Holger Levsen pushed to branch develop at Debian / piuparts


Commits:
6b3ab3d4 by Michael Stapelberg at 2018-08-10T13:09:04Z
debiman-piuparts-distill: also consider --install

fixes https://github.com/Debian/debiman/issues/106

- - - - -
e00d965a by Holger Levsen at 2018-08-10T13:10:29Z
add changelog entry for Michael

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

- - - - -


2 changed files:

- debian/changelog
- helpers/debiman-piuparts-distill/piuparts.go


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,10 @@
 piuparts (0.90) UNRELEASED; urgency=medium
 
+  [ Michael Stapelberg ]
+  * debiman-piuparts-distill: also consider --install, fixes
+    https://github.com/Debian/debiman/issues/106
+
+  [ Holger Levsen ]
   * Bump standards version to 4.2.0, no changes needed.
 
  -- Holger Levsen <holger at debian.org>  Tue, 12 Jun 2018 15:00:24 +0000


=====================================
helpers/debiman-piuparts-distill/piuparts.go
=====================================
--- a/helpers/debiman-piuparts-distill/piuparts.go
+++ b/helpers/debiman-piuparts-distill/piuparts.go
@@ -34,7 +34,7 @@ var (
 
 var (
 	logAlternativesRe = regexp.MustCompile(`LOG-ALTERNATIVES: dpkg=([^:]+): piuparts=(?:[^:]+): (.*)`)
-	slaveParamsRe     = regexp.MustCompile(`--slave ([^ ]+) (?:[^ ]+) ([^ ]+)`)
+	slaveParamsRe     = regexp.MustCompile(`--(?:install|slave) ([^ ]+) (?:[^ ]+) ([^ ]+)`)
 )
 
 type link struct {



View it on GitLab: https://salsa.debian.org/debian/piuparts/compare/a39ef7962826349d5a2a5b9d0191a5f0f4e6286d...e00d965aa35d4b80efa1a45b6bd7618a83b2d0c6

-- 
View it on GitLab: https://salsa.debian.org/debian/piuparts/compare/a39ef7962826349d5a2a5b9d0191a5f0f4e6286d...e00d965aa35d4b80efa1a45b6bd7618a83b2d0c6
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/20180810/130258f9/attachment.html>