Merge lp:~andrea.corbellini/software-properties/bug-399711 into lp:software-properties

Proposed by Andrea Corbellini on 2010-04-01
Status: Merged
Merged at revision: 612
Proposed branch: lp:~andrea.corbellini/software-properties/bug-399711
Merge into: lp:software-properties
Diff against target: 23 lines (+8/-5)
1 file modified
softwareproperties/SoftwareProperties.py (+8/-5)
To merge this branch: bzr merge lp:~andrea.corbellini/software-properties/bug-399711
Reviewer Review Type Date Requested Status
Michael Vogt 2010-04-01 Pending
Review via email: mp+22593@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'softwareproperties/SoftwareProperties.py'
2--- softwareproperties/SoftwareProperties.py 2010-03-26 13:18:23 +0000
3+++ softwareproperties/SoftwareProperties.py 2010-04-01 07:53:14 +0000
4@@ -627,12 +627,15 @@
5 Add a source with the given apt line and auto-add
6 signing key if we have it in the whitelist
7 """
8- (line, file) = expand_ppa_line(line.strip(), self.distro.codename)
9- self.check_and_add_key_for_whitelisted_channels(line)
10- new_entry = SourceEntry(line, file)
11- if new_entry.invalid:
12+ (deb_line, file) = expand_ppa_line(line.strip(), self.distro.codename)
13+ debsrc_line = 'deb-src' + deb_line[3:]
14+ new_deb_entry = SourceEntry(deb_line, file)
15+ new_debsrc_entry = SourceEntry(debsrc_line, file)
16+ if new_deb_entry.invalid or new_debsrc_entry.invalid:
17 return False
18- self.sourceslist.list.append(new_entry)
19+ self.check_and_add_key_for_whitelisted_channels(deb_line)
20+ self.sourceslist.list.append(new_deb_entry)
21+ self.sourceslist.list.append(new_debsrc_entry)
22 self.set_modified_sourceslist()
23 return True
24

Subscribers

People subscribed via source and target branches

to status/vote changes: