This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch master in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=733f459fc6c7c318bb3893ec9b63731dfb6c573a commit 733f459fc6c7c318bb3893ec9b63731dfb6c573a Author: Guillem Jover <guil...@debian.org> AuthorDate: Fri Jan 17 00:58:34 2020 +0100 dselect: Remove multi_mount method --- debian/changelog | 2 ++ dselect/methods/Makefile.am | 1 - dselect/methods/multicd/README.multicd | 12 +++--------- dselect/methods/multicd/desc.multi_mount | 11 ----------- dselect/methods/multicd/install | 12 ------------ dselect/methods/multicd/names | 1 - 6 files changed, 5 insertions(+), 34 deletions(-) diff --git a/debian/changelog b/debian/changelog index 52797b892..fe539ac53 100644 --- a/debian/changelog +++ b/debian/changelog @@ -69,6 +69,8 @@ dpkg (1.20.0) UNRELEASED; urgency=medium - Remove nfs methods, as there is nothing special about NFS, and mounting these should just be left to the local admin, who can mount any other remote filesystem too. + - Remove multi_mount method, as the multi_cd method can take care of + mounting the necessary images or devices. * Perl modules: - Dpkg::Source::Package: Verify original tarball signatures at build time. - Dpkg::BuildFlags: Add new unset() method. diff --git a/dselect/methods/Makefile.am b/dselect/methods/Makefile.am index dd2143db9..2fe915717 100644 --- a/dselect/methods/Makefile.am +++ b/dselect/methods/Makefile.am @@ -9,7 +9,6 @@ nobase_dist_methods_DATA = \ ftp/desc.ftp \ multicd/names \ multicd/desc.multi_cd \ - multicd/desc.multi_mount \ $(nil) nobase_methods_SCRIPTS = \ diff --git a/dselect/methods/multicd/README.multicd b/dselect/methods/multicd/README.multicd index 859807883..19e5856b4 100644 --- a/dselect/methods/multicd/README.multicd +++ b/dselect/methods/multicd/README.multicd @@ -1,15 +1,9 @@ -Installation methods for multiple binary CDs --------------------------------------------- +Installation method for multiple binary CDs +------------------------------------------- - This directory contains methods to be used within dselect in order to + This directory contains a method to be used within dselect in order to access Debian binary packages stored across multiple binary CD-ROMs. - These are the methods: - - . Multiple binary CD-ROMs - - . Multiple binary CD-ROMs, pre-mounted - Acquiring package data --------------------- diff --git a/dselect/methods/multicd/desc.multi_mount b/dselect/methods/multicd/desc.multi_mount deleted file mode 100644 index 884bef62c..000000000 --- a/dselect/methods/multicd/desc.multi_mount +++ /dev/null @@ -1,11 +0,0 @@ -Installation from a pre-mounted directory with changing content. - -The directory contains the Packages.gz file from each distribution -area being installed (usually main, contrib, non-free and local) -as well as an excerpt of the corresponding binary/*/*.deb files. - -The easiest way for them to get this is to make a (partial) copy of -the distribution site's directory hierarchy, if possible. - -The contents of the mounted directory may change. Thus it's possible -to use this method for installations from images of a CDROM set. diff --git a/dselect/methods/multicd/install b/dselect/methods/multicd/install index 14469eb1b..f1e2f6320 100755 --- a/dselect/methods/multicd/install +++ b/dselect/methods/multicd/install @@ -52,11 +52,6 @@ getdisklabel () { xit=1 do_umount() { - if [ "$method" = "multi_mount" ] - then - echo true - return - fi if [ -n "$umount" ]; then echo umount "$umount" #">/dev/null" "2>&1" @@ -64,13 +59,6 @@ do_umount() { } do_mount() { - - if [ "$method" = "multi_mount" ] - then - echo true - return - fi - if [ ! -b "$p_blockdev" ] then loop=",loop" diff --git a/dselect/methods/multicd/names b/dselect/methods/multicd/names index b3e5257a3..06cda706a 100644 --- a/dselect/methods/multicd/names +++ b/dselect/methods/multicd/names @@ -1,2 +1 @@ 31 multi_cd Install from a CD-ROM set. -46 multi_mount Install from a mounted partition with changing contents. -- Dpkg.Org's dpkg
