sts-sponsors team mailing list archive

[Alberto Donato <mp+439937@xxxxxxxxxxxxxxxxxx>]

Alberto Donato has proposed merging ~ack/maas:packaging-fixes into maas:master.

Commit message:
A few packaging tweaks:

 - add maas-sampledata script to deb package
 - exclude maasperf from python packaging
 - fix maas-sampledata description


Requested reviews:
  MAAS Maintainers (maas-maintainers)

For more details, see:
https://code.launchpad.net/~ack/maas/+git/maas/+merge/439937
-- 
Your team MAAS Maintainers is requested to review the proposed merge of ~ack/maas:packaging-fixes into maas:master.

diff --git a/debian/maas-region-api.install b/debian/maas-region-api.install
index 113d5bb..ba188b2 100644
--- a/debian/maas-region-api.install
+++ b/debian/maas-region-api.install
@@ -12,5 +12,6 @@ package-files/etc/maas/drivers.yaml etc/maas
 
 # Install all other stuff
 usr/bin/maas-region usr/sbin
+usr/bin/maas-sampledata usr/bin
 usr/bin/regiond usr/sbin
 debian/extras/maas_remote_syslog_compress etc/cron.d
diff --git a/setup.cfg b/setup.cfg
index 4b9efd6..5d2d8f8 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -33,6 +33,8 @@ exclude =
     *.pytest_tests
     maastesting
     maastesting.*
+    maasperf
+    maasperf.*
 
 [options.entry_points]
 console_scripts =
diff --git a/src/maasserver/testing/sampledata/main.py b/src/maasserver/testing/sampledata/main.py
index 99bdb56..33416d1 100644
--- a/src/maasserver/testing/sampledata/main.py
+++ b/src/maasserver/testing/sampledata/main.py
@@ -17,7 +17,7 @@ from .sampledata import generate
 
 def parse_args() -> Namespace:
     parser = ArgumentParser(
-        description="Configure storage for a machine",
+        description="Generate sample data in a MAAS database",
         formatter_class=ArgumentDefaultsHelpFormatter,
     )
     parser.add_argument("--db-name", help="database name")