summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Maw <jonathan.maw@codethink.co.uk>2017-07-27 12:03:50 +0100
committerJürg Billeter <j@bitron.ch>2017-07-27 11:53:33 +0000
commit99ad08ae7284109e018932ee57374864717a8e57 (patch)
tree6dc70bdbb81a8700c63f45eef331a15b3ce269b3
parentbfd822b3232f69ed9df48a20fedf31be7e0986f1 (diff)
downloadbuildstream-jonathan/fix-dpkg-docs.tar.gz
Fix dpkg_build and dpkg_deploy documentation using wrong script namesjonathan/fix-dpkg-docs
When writing the yaml, pre-install and post-install scripts' fields are named "preinst" and "postinst", not "preinstall" and "postinstall"
-rw-r--r--buildstream/plugins/elements/dpkg_build.py6
-rw-r--r--buildstream/plugins/elements/dpkg_deploy.py6
2 files changed, 6 insertions, 6 deletions
diff --git a/buildstream/plugins/elements/dpkg_build.py b/buildstream/plugins/elements/dpkg_build.py
index d7e90a242..bd8402314 100644
--- a/buildstream/plugins/elements/dpkg_build.py
+++ b/buildstream/plugins/elements/dpkg_build.py
@@ -88,7 +88,7 @@ e.g.
package-scripts
---------------
-preinstall, postinstall, prerm and postrm scripts may be written to the
+preinst, postinst, prerm and postrm scripts may be written to the
package if they are detected. They are written as raw text. e.g.
.. code:: yaml
@@ -96,11 +96,11 @@ package if they are detected. They are written as raw text. e.g.
public:
package-scripts:
foo:
- preinstall: |
+ preinst: |
#!/usr/bin/bash
/sbin/ldconfig
bar:
- postinstall: |
+ postinst: |
#!/usr/bin/bash
/usr/share/fonts/generate_fonts.sh
diff --git a/buildstream/plugins/elements/dpkg_deploy.py b/buildstream/plugins/elements/dpkg_deploy.py
index 6cab00e91..e2b3470a0 100644
--- a/buildstream/plugins/elements/dpkg_deploy.py
+++ b/buildstream/plugins/elements/dpkg_deploy.py
@@ -102,7 +102,7 @@ will create a package named "foo-bar"
package-scripts
---------------
-preinstall, postinstall, prerm and postrm scripts will be generated
+preinst, postinst, prerm and postrm scripts will be generated
based on data in pacakge-scripts, if it exists. The scripts are formatted as
raw text, e.g.
@@ -111,11 +111,11 @@ raw text, e.g.
public:
package-scripts:
foo:
- preinstall: |
+ preinst: |
#!/usr/bin/bash
/sbin/ldconfig
bar:
- postinstall: |
+ postinst: |
#!/usr/bin/bash
/usr/share/fonts/generate_fonts.sh