null+****@clear*****
null+****@clear*****
2012年 4月 29日 (日) 10:47:38 JST
Kouhei Sutou 2012-04-29 10:47:38 +0900 (Sun, 29 Apr 2012)
New Revision: e8f0b2a5a4e57bccadbc50b6f22e84a2971898c3
Log:
apt: use apt-get instead of aptitude
Because aptitude on sid is broken. :<
Modified files:
packages/apt/build-deb.sh
Modified: packages/apt/build-deb.sh (+9 -13)
===================================================================
--- packages/apt/build-deb.sh 2012-04-29 10:37:49 +0900 (41bc63c)
+++ packages/apt/build-deb.sh 2012-04-29 10:47:38 +0900 (b559af9)
@@ -22,17 +22,13 @@ run()
grep '^deb ' /etc/apt/sources.list | \
sed -e 's/^deb /deb-src /' > /etc/apt/sources.list.d/base-source.list
-if [ ! -x /usr/bin/aptitude ]; then
- run apt-get update
- run apt-get install -y aptitude
-fi
-run aptitude update -V -D
-run aptitude install -V -D -y --allow-untrusted groonga-keyring
-run aptitude safe-upgrade -V -D -y
+run apt-get update -V
+run apt-get install -V -y --allow-unauthenticated groonga-keyring
+run apt-get upgrade -V -y
security_list=/etc/apt/sources.list.d/security.list
if [ ! -d "${security_list}" ]; then
- run aptitude install -V -D -y lsb-release
+ run apt-get install -V -y lsb-release
distribution=$(lsb_release --id --short)
code_name=$(lsb_release --codename --short)
@@ -55,13 +51,13 @@ EOF
;;
esac
- run aptitude update -V -D
- run aptitude safe-upgrade -V -D -y
+ run apt-get update -V
+ run apt-get upgrade -V -y
fi
-run aptitude install -V -D -y devscripts ${DEPENDED_PACKAGES}
-run aptitude build-dep -V -D -y ${mysql_server_package}
-run aptitude clean
+run apt-get install -V -y devscripts ${DEPENDED_PACKAGES}
+run apt-get build-dep -V -y ${mysql_server_package}
+run apt-get clean
if ! id $USER_NAME >/dev/null 2>&1; then
run useradd -m $USER_NAME