[devscripts] 01/01: chdist: add support for apt and suggest it instead of apt-get

[Paul Wise]

This is an automated email from the git hooks/post-receive script.

pabs pushed a commit to branch master
in repository devscripts.

commit d4318a282976c6bdd808122b748bd0c0a216b4dc
Author: Paul Wise <pabs at debian.org>
Date:   Wed Jun 15 19:27:59 2016 +0800

    chdist: add support for apt and suggest it instead of apt-get
---
 debian/changelog               | 2 ++
 scripts/chdist.bash_completion | 4 ++--
 scripts/chdist.pl              | 9 ++++++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fd0eb96..ac59429 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,8 @@ devscripts (2.16.6) UNRELEASED; urgency=medium
     + Fix typo of "release" in description of git repository mode
   * debsnap:
     + Avoid an extra / in the srcfiles URL
+  * chdist:
+    + add support for apt and suggest it instead of apt-get
 
   [ Antonio Terceiro ]
   * debc:
diff --git a/scripts/chdist.bash_completion b/scripts/chdist.bash_completion
index 08fb7fa..134d458 100644
--- a/scripts/chdist.bash_completion
+++ b/scripts/chdist.bash_completion
@@ -6,7 +6,7 @@ _chdist ()
 {
   local cur=$2 prev=$3
   local options='--help -h --data-dir -d --arch -a'
-  local commands='create apt-get apt-cache apt-rdepends
+  local commands='create apt apt-get apt-cache apt-rdepends
            src2bin bin2src
        compare-packages compare-bin-packages
        compare-versions compare-bin-versions
@@ -31,7 +31,7 @@ _chdist ()
     -@(-help|h)|list)
         return 0
     ;;
-    create|apt-get|apt-cache|apt-rdepends|src2bin|bin2src|compare-packages|compare-bin-packages|compare-versions|compare-bin-versions|grep-dctrl-packages|grep-dctrl-sources)
+    create|apt|apt-get|apt-cache|apt-rdepends|src2bin|bin2src|compare-packages|compare-bin-packages|compare-versions|compare-bin-versions|grep-dctrl-packages|grep-dctrl-sources)
         COMPREPLY=( $( compgen -W "$dists" -- $cur ) )
     return 0
   esac
diff --git a/scripts/chdist.pl b/scripts/chdist.pl
index fd37d4d..0dcb643 100755
--- a/scripts/chdist.pl
+++ b/scripts/chdist.pl
@@ -60,6 +60,10 @@ Display version information.
 
 Prepare a new tree named I<DIST>
 
+=item B<apt> I<DIST> <B<update>|B<source>|B<show>|B<showsrc>|...>
+
+Run B<apt> inside I<DIST>
+
 =item B<apt-get> I<DIST> <B<update>|B<source>|...>
 
 Run B<apt-get> inside I<DIST>
@@ -425,7 +429,7 @@ EOF
 	}
     }
     print "Now edit $dir/etc/apt/sources.list\n" unless $version;
-    print "Run chdist apt-get $dist update\n";
+    print "Run chdist apt $dist update\n";
     print "And enjoy.\n";
 }
 
@@ -699,6 +703,9 @@ given ($command) {
     when ('create') {
 	dist_create(@ARGV);
     }
+    when ('apt') {
+	aptcmd('apt', @ARGV);
+    }
     when ('apt-get') {
 	aptcmd('apt-get', @ARGV);
     }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git