migrate libtool to newer rosdep syntax, cleanout pre-lucid rules

This commit is contained in:
Ken Conley 2011-07-14 22:01:51 +00:00
parent b426a36f12
commit 1eefd85a98
2 changed files with 4 additions and 7 deletions

View File

@ -26,8 +26,7 @@ python-yaml:
if [ ! -d /usr/lib/python2.5/site-packages/yaml/ ] ; then
mkdir -p ~/ros/ros-deps
cd ~/ros/ros-deps
wget --tries=10 http://pyyaml.org/download/pyyaml/PyYAML-3.09.tar.gz
tar xzf PyYAML-3.09.tar.gz
wget --tries=10 http://pyyaml.org/download/pyyaml/PyYAML-3.09.tar.gz tar xzf PyYAML-3.09.tar.gz
cd PyYAML-3.09
python setup.py install
fi
@ -265,11 +264,8 @@ automake:
freebsd: automake14 automake111
libtool:
ubuntu:
'11.04': libtool libltdl-dev
'10.10': libtool libltdl-dev
'10.04': libtool libltdl-dev
'9.10': libtool libltdl-dev
'9.04': libtool libltdl7-dev
apt:
packages: [libtool, libltdl-dev]
debian:
squeeze: libtool libltdl-dev
lenny: libtool libltdl3-dev

View File

@ -277,6 +277,7 @@ class AptInstaller(InstallerAPI):
version_lock_map[p] = p
cmd = ['dpkg-query', '-W', '-f=\'${Package} ${Status}\n\'']
cmd.extend(version_lock_map.keys())
pop = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
(std_out, std_err) = pop.communicate()
std_out = std_out.replace('\'','')