Merge lp:~sil2100/livecd-rootfs/deb-src_for_extra_ppas into lp:livecd-rootfs

Proposed by Łukasz Zemczak
Status: Merged
Merge reported by: Sebastien Bacher
Merged at revision: not available
Proposed branch: lp:~sil2100/livecd-rootfs/deb-src_for_extra_ppas
Merge into: lp:livecd-rootfs
Diff against target: 17 lines (+6/-1)
1 file modified
live-build/auto/config (+6/-1)
To merge this branch: bzr merge lp:~sil2100/livecd-rootfs/deb-src_for_extra_ppas
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
Review via email: mp+267375@code.launchpad.net

Commit message

In case of extra PPAs also include the deb-src entry in the sources list.

Description of the change

In case of extra PPAs also include the deb-src entry in the sources list.

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'live-build/auto/config'
--- live-build/auto/config 2015-06-25 11:36:42 +0000
+++ live-build/auto/config 2015-08-07 16:06:30 +0000
@@ -687,7 +687,12 @@
687 ;;687 ;;
688 esac688 esac
689 extra_ppa_fingerprint="$(/usr/share/livecd-rootfs/get-ppa-fingerprint "$extra_ppa")"689 extra_ppa_fingerprint="$(/usr/share/livecd-rootfs/get-ppa-fingerprint "$extra_ppa")"
690 echo "deb http://ppa.launchpad.net/$extra_ppa/ubuntu @DISTRIBUTION@ main" >> config/archives/extra-ppas.list.chroot690
691 cat >> config/archives/extra-ppas.list.chroot <<EOF
692deb http://ppa.launchpad.net/$extra_ppa/ubuntu @DISTRIBUTION@ main
693deb-src http://ppa.launchpad.net/$extra_ppa/ubuntu @DISTRIBUTION@ main
694EOF
695
691 if [ -n "$extra_ppa_pin" ]; then696 if [ -n "$extra_ppa_pin" ]; then
692 extra_ppa_origin="LP-PPA-$(echo $extra_ppa | sed -e 's,/ppa$,,' -e 's,/,-,')"697 extra_ppa_origin="LP-PPA-$(echo $extra_ppa | sed -e 's,/ppa$,,' -e 's,/,-,')"
693 echo "Package: *" >> config/archives/extra-ppas.pref.chroot698 echo "Package: *" >> config/archives/extra-ppas.pref.chroot

Subscribers

People subscribed via source and target branches