From b885fa0e8399a7f3d372e91c703381febd29f31b Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Mon, 21 Mar 2005 20:03:56 +0000 Subject: [PATCH] - Use the extend method of list objects to append a new list rather than a bunch of append calls when adding more ports to an existing list. - Remove the compatXY packages from disc1 as they are only intended for use on 5.x (6.x doesn't have them as dists anymore) and on 5.x they aren't packages but are old-fashioned distribution tarballs anyway. --- release/scripts/package-split.py | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/release/scripts/package-split.py b/release/scripts/package-split.py index b208ef9f40c..90a6f910d9d 100644 --- a/release/scripts/package-split.py +++ b/release/scripts/package-split.py @@ -28,18 +28,13 @@ else: def disc1_packages(): # 5.x only pkgs = ['lang/perl5.8'] - pkgs.append('x11/xorg') - pkgs.append('x11/xorg-manpages') - pkgs.append('devel/imake-6') + pkgs.extend(['x11/xorg', + 'x11/xorg-manpages', + 'devel/imake-6']) if arch == 'alpha': pkgs.append('emulators/osf1_base') elif arch == 'i386': pkgs.append('emulators/linux_base-8') - # 5.x only - if arch == 'i386': - pkgs.append('misc/compat22') - pkgs.append('misc/compat3x') - pkgs.append('misc/compat4x') return pkgs # List of packages for disc2. This includes packages that the X desktop @@ -104,9 +99,9 @@ def disc2_packages(): 'www/apache13-modssl', 'www/apache2'] if arch == 'i386': - pkgs.append('comms/ltmdm') - pkgs.append('print/acroread') - pkgs.append('www/opera') + pkgs.extend(['comms/ltmdm', + 'print/acroread', + 'www/opera']) return pkgs # The list of desired packages