diff --git a/debian/changelog b/debian/changelog index e6d8b7d..25a0063 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,6 +30,8 @@ xen-tools (4.4~dev-1) UNRELEASED; urgency=low on Ubuntu Intrepid and newer (Hopefully closes: #640099, LP #839492) - Installs a legacy grub in all pygrub based DomUs to be able to update the menu.list automatically. + - hooks/common.sh: Rename installCentOS4Package to installRPMPackage. + Add installCentOS4Package wrapper for backward compatibility. * Add debian/gbp.conf to be able to to build xen-tools with git-buildpackage. * Clean up debian/rules: diff --git a/hooks/common.sh b/hooks/common.sh index 73311c4..b7ba661 100755 --- a/hooks/common.sh +++ b/hooks/common.sh @@ -191,9 +191,9 @@ removeDebianPackage () # -# Install a CentOS4 package via yum +# Install a RPM package via yum # -installCentOS4Package () +installRPMPackage () { prefix=$1 package=$2 @@ -201,7 +201,7 @@ installCentOS4Package () # # Log our options # - logMessage "Installing CentOS4 ${package} to prefix ${prefix}" + logMessage "Installing RPM ${package} to prefix ${prefix}" # # We require a package + prefix @@ -220,6 +220,8 @@ installCentOS4Package () chroot ${prefix} /usr/bin/yum -y install ${package} } +# Backwards Compatibility Function +installCentOS4Package () { installRPMPackage "$@" } # @@ -234,7 +236,7 @@ installPackage () installDebianPackage "$@" elif [ -x ${prefix}/usr/bin/yum ] ; then - installCentOS4Package "$@" + installRPMPackage "$@" else logMessage "Unable to install package ${package}; no package manager found"