From 62eeec0797e59027cc2940af2f2ac916f45e1442 Mon Sep 17 00:00:00 2001 From: Jamie Cameron Date: Wed, 7 Jan 2009 18:11:20 +0000 Subject: [PATCH] Option to not use any update system --- software/CHANGELOG | 2 ++ software/config.info | 2 +- software/software-lib.pl | 6 +++++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/software/CHANGELOG b/software/CHANGELOG index e19d3152e..2762e80c4 100644 --- a/software/CHANGELOG +++ b/software/CHANGELOG @@ -23,3 +23,5 @@ Fixed several bugs related to finding available updates on Debian and Redhat. Added detection of epochs for RPMs and packages from YUM. ---- Changes since 1.340 ---- Added an Upgrade All button for CSW packages. +---- Changes since 1.440 ---- +Added a Module Config option to not use any update system, even if YUM or APT are installed. diff --git a/software/config.info b/software/config.info index 74e8f80de..985bfad27 100644 --- a/software/config.info +++ b/software/config.info @@ -1,3 +1,3 @@ package_system=Package management system,4,rpm-RPM,pkgadd-Solaris,hpux-HPUX,freebsd-FreeBSD,slackware-Slackware,debian-Debian,aix-AIX,emerge-Gentoo,cygwin-Cygwin,msi-Microsoft Installer -update_system=Package update system,1,-Detect automatically,apt-APT,yum-YUM,rhn-Redhat Network,csw-Blastwave,urpmi-URPMI,emerge-Emerge +update_system=Package update system,1,-Detect automatically,apt-APT,yum-YUM,rhn-Redhat Network,csw-Blastwave,urpmi-URPMI,emerge-Emerge,*-None apt_mode=Command to use for APT installs,1,0-apt-get,1-aptitute diff --git a/software/software-lib.pl b/software/software-lib.pl index 7ee2acabe..71985a1c1 100644 --- a/software/software-lib.pl +++ b/software/software-lib.pl @@ -11,7 +11,11 @@ $heiropen_file = "$module_config_directory/heiropen"; # we are using. do "$config{package_system}-lib.pl"; -if ($config{'update_system'}) { +if ($config{'update_system'} eq '*') { + # User specifically doesn't want any + $update_system = undef; + } +elsif ($config{'update_system'}) { # User-specified system $update_system = $config{'update_system'}; }