Download as
Browse Code »

Commit 4856846bfc9b1c20577ecab15ce08108e698c3fe

Authored by Antonio Terceiro
1 parent ce362344
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

util/debian-install: revamp 

- Always install with APT. When using local packages, create a local APT
  repository so that we always properly test dependency resolution.
- Refresh local debs if the ones in pkg/ were updated
- Use backports (needed for new dependencies)
Showing 2 changed files with 29 additions and 11 deletions   Show diff stats
util/debian-install/Vagrantfile
  Diff comments   View file @4856846
@@ -13,9 +13,11 @@ else @@ -13,9 +13,11 @@ else
13 local_debs = Dir.glob('*.deb') 13 local_debs = Dir.glob('*.deb')
14 debs.each do |f| 14 debs.each do |f|
15 fn = File.basename(f) 15 fn = File.basename(f)
16 - if local_debs.include?(fn)  
17 - local_debs.delete(fn)  
18 - else 16 +
  17 + local_debs.delete(fn)
  18 +
  19 + if File.stat(f) != File.stat(fn)
  20 + FileUtils::Verbose.rm_f(fn)
19 FileUtils::Verbose.ln f, '.' 21 FileUtils::Verbose.ln f, '.'
20 end 22 end
21 end 23 end
util/debian-install/install
  Diff comments   View file @4856846
@@ -61,19 +61,35 @@ deb http://download.noosfero.org/debian/wheezy-test ./ @@ -61,19 +61,35 @@ deb http://download.noosfero.org/debian/wheezy-test ./
61 deb-src http://download.noosfero.org/debian/wheezy-test ./ 61 deb-src http://download.noosfero.org/debian/wheezy-test ./
62 EOF 62 EOF
63 63
  64 +sed -e 's/wheezy/&-backports/' \
  65 + /etc/apt/sources.list > /etc/apt/sources.list.d/backports.list
  66 +
64 export DEBIAN_FRONTEND=noninteractive 67 export DEBIAN_FRONTEND=noninteractive
65 68
  69 +# local debs
  70 +if [ -n "$(find /vagrant -name '*.deb')" ]; then
  71 + apt-get install -qy apt-utils bzip2
  72 + (
  73 + rm -rf /opt/noosfero
  74 + mkdir /opt/noosfero
  75 + cp /vagrant/*.deb /opt/noosfero
  76 + cd /opt/noosfero
  77 + apt-ftparchive packages . > Packages
  78 + cat Packages | gzip - > Packages.gz
  79 + cat Packages | bzip2 - > Packages.bz2
  80 + apt-ftparchive release . > Release
  81 + echo 'deb [trusted=yes] file:///opt/noosfero ./' > /etc/apt/sources.list.d/local.list
  82 + )
  83 +else
  84 + rm -f /etc/apt/sources.list.d/local.list
  85 +fi
  86 +
66 apt-get update 87 apt-get update
67 apt-get dist-upgrade -qy 88 apt-get dist-upgrade -qy
68 -apt-get install -qy postgresql ruby1.8 89 +apt-get install -qy postgresql
69 90
70 -if dpkg --unpack /vagrant/noosfero_*.deb /vagrant/noosfero-apache_*.deb; then  
71 - apt-cache policy noosfero  
72 - apt-get install -qyf  
73 -else  
74 - apt-cache policy noosfero  
75 - apt-get install -qy noosfero noosfero-apache  
76 -fi 91 +apt-cache policy noosfero
  92 +apt-get install -qy noosfero noosfero-apache
77 93
78 a2dissite 000-default 94 a2dissite 000-default
79 service apache2 reload 95 service apache2 reload