Merge lp:~fougner/ubuntu/oneiric/base-files/fix-for-790050 into lp:ubuntu/oneiric/base-files

Proposed by Alexander Fougner on 2011-06-17
Status: Merged
Merged at revision: 76
Proposed branch: lp:~fougner/ubuntu/oneiric/base-files/fix-for-790050
Merge into: lp:ubuntu/oneiric/base-files
Diff against target: 57 lines (+8/-13)
4 files modified
debian/changelog (+7/-0)
debian/directory-list (+0/-1)
share/profile (+0/-12)
share/profile.md5sums (+1/-0)
To merge this branch: bzr merge lp:~fougner/ubuntu/oneiric/base-files/fix-for-790050
Reviewer Review Type Date Requested Status
Barry Warsaw (community) Approve on 2011-07-07
Ubuntu branches 2011-06-17 Pending
Review via email: mp+65070@code.launchpad.net
To post a comment you must log in.
76. By Alexander Fougner on 2011-06-18

changed release name in debian/changelog, natty->oneiric

Anders Kaseorg (andersk) wrote :

In the interest of reducing the delta from Debian <http://patches.ubuntu.com/b/base-files/base-files_6.3ubuntu2.patch>:
• There also are two copies of ‘etc/profile.d’ in debian/directory-list. The second was added by Ubuntu and should be removed.
• The comment about the default umask isn’t in Debian at all and might as well be removed now too.

When modifying share/profile, you also need to update share/profile.md5sums (by running ‘debian/rules clean’), so that old copies of /etc/profile will be automatically updated by the postinst.

77. By Alexander Fougner on 2011-06-22

deleted duplicate entries in debian/directory-list
removed unneeded comment from share/profile

Barry Warsaw (barry) wrote :

Hi Alexander, thanks for your contribution to Ubuntu.

It looks to me like your patch removes too much from share/profile. While your commit message specifically says that you're removing an unneeded comment from share/profile, you're actually also removing the sourcing of /etc/profile.d/*.sh. That clearly can't be right, e.g. it would stop the sourcing of bash_completion.sh on my Oneiric machine.

Can you please push an update to your branch? I'll be happy to re-review and sponsor it when you do.

review: Needs Fixing
Barry Warsaw (barry) wrote :

Oh wait, never mind. I see what's going on now.

Barry Warsaw (barry) :
review: Approve
Barry Warsaw (barry) wrote :

Uploaded. Thanks again for your contribution!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-05-04 23:20:17 +0000
3+++ debian/changelog 2011-06-22 08:29:35 +0000
4@@ -1,3 +1,10 @@
5+base-files (6.3ubuntu3) oneiric; urgency=low
6+
7+ * Removed duplicate code in share/profile, causing /etc/profile.d/*
8+ scripts to be executed twice (LP: #790050)
9+
10+ -- Alexander Fougner <fougner89@gmail.com> Sat, 18 Jun 2011 00:23:05 +0200
11+
12 base-files (6.3ubuntu2) oneiric; urgency=low
13
14 * Restore /usr/share/base-files/networks.
15
16=== modified file 'debian/directory-list'
17--- debian/directory-list 2011-05-04 10:31:43 +0000
18+++ debian/directory-list 2011-06-22 08:29:35 +0000
19@@ -3,7 +3,6 @@
20 dev
21 etc
22 etc/default
23-etc/profile.d
24 etc/skel
25 etc/profile.d
26 etc/update-motd.d
27
28=== modified file 'share/profile'
29--- share/profile 2011-05-04 10:31:43 +0000
30+++ share/profile 2011-06-22 08:29:35 +0000
31@@ -25,15 +25,3 @@
32 fi
33 fi
34 fi
35-
36-# The default umask is now handled by pam_umask.
37-# See pam_umask(8) and /etc/login.defs.
38-
39-if [ -d /etc/profile.d ]; then
40- for i in /etc/profile.d/*.sh; do
41- if [ -r $i ]; then
42- . $i
43- fi
44- done
45- unset i
46-fi
47
48=== modified file 'share/profile.md5sums'
49--- share/profile.md5sums 2011-05-04 10:31:43 +0000
50+++ share/profile.md5sums 2011-06-22 08:29:35 +0000
51@@ -1,5 +1,6 @@
52 4a409a5f2242928822658b14918b2ee1
53 61a3f85a2dc30f4e920f615109137be5
54+863ed3bf8041b035234cce25d4792fdd
55 9519666d98e08940df6f25dcf4598bef
56 9a279ae6bdd1251f64b7e70e960ef00d
57 b59ea6ac3a1ad8c0527ec94f73bafca0

Subscribers

People subscribed via source and target branches