Merge lp:~oubiwann/ubuntu-community-accomplishments/946809-module-changes into lp:~ubuntu-community-accomplishments-reviewers/ubuntu-community-accomplishments/0.1
- 946809-module-changes
- Merge into 0.1
Proposed by
Duncan McGreggor
| Status: | Merged |
|---|---|
| Approved by: | Jono Bacon |
| Approved revision: | 34 |
| Merge reported by: | Duncan McGreggor |
| Merged at revision: | not available |
| Proposed branch: | lp:~oubiwann/ubuntu-community-accomplishments/946809-module-changes |
| Merge into: | lp:~ubuntu-community-accomplishments-reviewers/ubuntu-community-accomplishments/0.1 |
| Diff against target: |
808 lines (+127/-194) 14 files modified
scripts/ubuntu-community/community-council-member.py (+8/-13) scripts/ubuntu-community/core-dev.py (+8/-13) scripts/ubuntu-community/first-bug-confirmed.py (+12/-14) scripts/ubuntu-community/first-bug.py (+12/-13) scripts/ubuntu-community/fridge-editor.py (+8/-14) scripts/ubuntu-community/juju-charm-contributor.py (+10/-15) scripts/ubuntu-community/juju-charm-reviewer.py (+8/-15) scripts/ubuntu-community/loco-council-member.py (+10/-16) scripts/ubuntu-community/member-loco-team.py (+9/-13) scripts/ubuntu-community/motu.py (+8/-15) scripts/ubuntu-community/registered-on-launchpad.py (+10/-12) scripts/ubuntu-community/signed-code-of-conduct.py (+8/-11) scripts/ubuntu-community/technical-board-member.py (+8/-15) scripts/ubuntu-community/ubuntu-member.py (+8/-15) |
| To merge this branch: | bzr merge lp:~oubiwann/ubuntu-community-accomplishments/946809-module-changes |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Duncan McGreggor (community) | Approve | ||
| Jono Bacon | Disapprove | ||
|
Review via email:
|
|||
Commit message
Description of the change
Note that this needs to be merged at the same (approximate) time as the other branch (https:/
To post a comment you must log in.
Revision history for this message
| Duncan McGreggor (oubiwann) wrote : | # |
Wait, so I don't understand your merge comment, Jono:
"Looks like this was mean't to go into lp:ubuntu-accomplishments-system"
That's correct, this wasn't mean to go into there. If you look at the top of the merge proposal page, you'll see this:
Merge into: lp:ubuntu-community-accomplishments
The community accomplishments code is what this change is against.
The reason that this is needed, is that the deamon code location has changed. As such, the imports in this code need to change...
review:
Needs Resubmitting
Revision history for this message
| Jono Bacon (jonobacon) wrote : | # |
Oh I see, gotcha. I will take a look soon.
On 5 March 2012 06:21, Duncan McGreggor <email address hidden> wrote:
> Review: Resubmit
>
> Wait, so I don't understand your merge comment, Jono:
>
> "Looks like this was mean't to go into lp:ubuntu-accomplishments-system"
>
> That's correct, this wasn't mean to go into there. If you look at the top of the merge proposal page, you'll see this:
>
> Merge into: lp:ubuntu-community-accomplishments
>
> The community accomplishments code is what this change is against.
>
> The reason that this is needed, is that the deamon code location has changed. As such, the imports in this code need to change...
> --
> https:/
> You are reviewing the proposed merge of lp:~oubiwann/ubuntu-community-accomplishments/946809-module-changes into lp:ubuntu-community-accomplishments.
--
Jono Bacon
Ubuntu Community Manager
www.ubuntu.com / www.jonobacon.org
www.identi.
Revision history for this message
| Duncan McGreggor (oubiwann) wrote : | # |
For the record, Jono merged this yesterday, even though the status of the branch shows him having rejected it.
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | === modified file 'scripts/ubuntu-community/community-council-member.py' | |||
| 2 | --- scripts/ubuntu-community/community-council-member.py 2012-02-24 00:08:50 +0000 | |||
| 3 | +++ scripts/ubuntu-community/community-council-member.py 2012-03-05 03:55:20 +0000 | |||
| 4 | @@ -1,35 +1,32 @@ | |||
| 5 | 1 | #!/usr/bin/python | 1 | #!/usr/bin/python |
| 6 | 2 | |||
| 7 | 3 | import traceback, sys | 2 | import traceback, sys |
| 9 | 4 | import libaccomplishments | 3 | |
| 10 | 4 | from accomplishments.daemon import dbusapi | ||
| 11 | 5 | |||
| 12 | 5 | 6 | ||
| 13 | 6 | try: | 7 | try: |
| 14 | 7 | import json, sys, os, pwd, subprocess | 8 | import json, sys, os, pwd, subprocess |
| 15 | 8 | from ubuntuone.couch import auth | 9 | from ubuntuone.couch import auth |
| 16 | 9 | from launchpadlib.launchpad import Launchpad | 10 | from launchpadlib.launchpad import Launchpad |
| 17 | 10 | 11 | ||
| 22 | 11 | libaccom = libaccomplishments.Accomplishments() | 12 | api = dbusapi.Accomplishments() |
| 23 | 12 | 13 | f = api.getExtraInformation("ubuntu-community", "launchpad-email") | |
| 20 | 13 | f = libaccom.getExtraInformation("ubuntu-community", "launchpad-email") | ||
| 21 | 14 | |||
| 24 | 15 | if bool(f[0]["launchpad-email"]) == False: | 14 | if bool(f[0]["launchpad-email"]) == False: |
| 25 | 16 | sys.exit(4) | 15 | sys.exit(4) |
| 26 | 17 | else: | 16 | else: |
| 27 | 18 | email = f[0]["launchpad-email"] | 17 | email = f[0]["launchpad-email"] |
| 28 | 19 | 18 | ||
| 31 | 20 | lp=Launchpad.login_anonymously('ubuntu-community accomplishments','production') | 19 | lp = Launchpad.login_anonymously( |
| 32 | 21 | me=lp.people.getByEmail(email=email) | 20 | 'ubuntu-community accomplishments', 'production') |
| 33 | 21 | me = lp.people.getByEmail(email=email) | ||
| 34 | 22 | 22 | ||
| 35 | 23 | if me == None: | 23 | if me == None: |
| 36 | 24 | sys.exit(1) | 24 | sys.exit(1) |
| 37 | 25 | else: | 25 | else: |
| 38 | 26 | user = me.name | 26 | user = me.name |
| 39 | 27 | |||
| 40 | 28 | teams = [team.name for team in lp.people['communitycouncil'].sub_teams] | 27 | teams = [team.name for team in lp.people['communitycouncil'].sub_teams] |
| 41 | 29 | |||
| 42 | 30 | if teams == []: | 28 | if teams == []: |
| 43 | 31 | teams.append(lp.people['communitycouncil'].name) | 29 | teams.append(lp.people['communitycouncil'].name) |
| 44 | 32 | |||
| 45 | 33 | try: | 30 | try: |
| 46 | 34 | memberships = [ | 31 | memberships = [ |
| 47 | 35 | membership for membership in | 32 | membership for membership in |
| 48 | @@ -38,7 +35,6 @@ | |||
| 49 | 38 | ['communitycouncil'] + teams] | 35 | ['communitycouncil'] + teams] |
| 50 | 39 | except KeyError: | 36 | except KeyError: |
| 51 | 40 | memberships = [] | 37 | memberships = [] |
| 52 | 41 | |||
| 53 | 42 | if memberships: | 38 | if memberships: |
| 54 | 43 | sys.exit(0) | 39 | sys.exit(0) |
| 55 | 44 | else: | 40 | else: |
| 56 | @@ -49,4 +45,3 @@ | |||
| 57 | 49 | except: | 45 | except: |
| 58 | 50 | traceback.print_exc() | 46 | traceback.print_exc() |
| 59 | 51 | sys.exit(2) | 47 | sys.exit(2) |
| 60 | 52 | |||
| 61 | 53 | 48 | ||
| 62 | === modified file 'scripts/ubuntu-community/core-dev.py' | |||
| 63 | --- scripts/ubuntu-community/core-dev.py 2012-02-21 03:39:06 +0000 | |||
| 64 | +++ scripts/ubuntu-community/core-dev.py 2012-03-05 03:55:20 +0000 | |||
| 65 | @@ -1,35 +1,32 @@ | |||
| 66 | 1 | #!/usr/bin/python | 1 | #!/usr/bin/python |
| 67 | 2 | |||
| 68 | 3 | import traceback, sys | 2 | import traceback, sys |
| 70 | 4 | import libaccomplishments | 3 | |
| 71 | 4 | from accomplishments.daemon import dbusapi | ||
| 72 | 5 | |||
| 73 | 5 | 6 | ||
| 74 | 6 | try: | 7 | try: |
| 75 | 7 | import json, sys, os, pwd, subprocess | 8 | import json, sys, os, pwd, subprocess |
| 76 | 8 | from ubuntuone.couch import auth | 9 | from ubuntuone.couch import auth |
| 77 | 9 | from launchpadlib.launchpad import Launchpad | 10 | from launchpadlib.launchpad import Launchpad |
| 78 | 10 | 11 | ||
| 83 | 11 | libaccom = libaccomplishments.Accomplishments() | 12 | api = dbusapi.Accomplishments() |
| 84 | 12 | 13 | f = api.getExtraInformation("ubuntu-community", "launchpad-email") | |
| 81 | 13 | f = libaccom.getExtraInformation("ubuntu-community", "launchpad-email") | ||
| 82 | 14 | |||
| 85 | 15 | if bool(f[0]["launchpad-email"]) == False: | 14 | if bool(f[0]["launchpad-email"]) == False: |
| 86 | 16 | sys.exit(4) | 15 | sys.exit(4) |
| 87 | 17 | else: | 16 | else: |
| 88 | 18 | email = f[0]["launchpad-email"] | 17 | email = f[0]["launchpad-email"] |
| 89 | 19 | 18 | ||
| 92 | 20 | lp=Launchpad.login_anonymously('ubuntu-community accomplishments','production') | 19 | lp = Launchpad.login_anonymously( |
| 93 | 21 | me=lp.people.getByEmail(email=email) | 20 | 'ubuntu-community accomplishments', 'production') |
| 94 | 21 | me = lp.people.getByEmail(email=email) | ||
| 95 | 22 | 22 | ||
| 96 | 23 | if me == None: | 23 | if me == None: |
| 97 | 24 | sys.exit(1) | 24 | sys.exit(1) |
| 98 | 25 | else: | 25 | else: |
| 99 | 26 | user = me.name | 26 | user = me.name |
| 100 | 27 | |||
| 101 | 28 | teams = [team.name for team in lp.people['ubuntu-core-dev'].sub_teams] | 27 | teams = [team.name for team in lp.people['ubuntu-core-dev'].sub_teams] |
| 102 | 29 | |||
| 103 | 30 | if teams == []: | 28 | if teams == []: |
| 104 | 31 | teams.append(lp.people['ubuntu-core-dev'].name) | 29 | teams.append(lp.people['ubuntu-core-dev'].name) |
| 105 | 32 | |||
| 106 | 33 | try: | 30 | try: |
| 107 | 34 | memberships = [ | 31 | memberships = [ |
| 108 | 35 | membership for membership in | 32 | membership for membership in |
| 109 | @@ -38,7 +35,6 @@ | |||
| 110 | 38 | ['ubuntu-core-dev'] + teams] | 35 | ['ubuntu-core-dev'] + teams] |
| 111 | 39 | except KeyError: | 36 | except KeyError: |
| 112 | 40 | memberships = [] | 37 | memberships = [] |
| 113 | 41 | |||
| 114 | 42 | if memberships: | 38 | if memberships: |
| 115 | 43 | sys.exit(0) | 39 | sys.exit(0) |
| 116 | 44 | else: | 40 | else: |
| 117 | @@ -49,4 +45,3 @@ | |||
| 118 | 49 | except: | 45 | except: |
| 119 | 50 | traceback.print_exc() | 46 | traceback.print_exc() |
| 120 | 51 | sys.exit(2) | 47 | sys.exit(2) |
| 121 | 52 | |||
| 122 | 53 | 48 | ||
| 123 | === modified file 'scripts/ubuntu-community/first-bug-confirmed.py' | |||
| 124 | --- scripts/ubuntu-community/first-bug-confirmed.py 2012-03-02 14:14:47 +0000 | |||
| 125 | +++ scripts/ubuntu-community/first-bug-confirmed.py 2012-03-05 03:55:20 +0000 | |||
| 126 | @@ -1,34 +1,33 @@ | |||
| 127 | 1 | #!/usr/bin/python | 1 | #!/usr/bin/python |
| 128 | 2 | |||
| 129 | 3 | import traceback, sys | 2 | import traceback, sys |
| 131 | 4 | import libaccomplishments | 3 | |
| 132 | 4 | from accomplishments.daemon import dbusapi | ||
| 133 | 5 | |||
| 134 | 5 | 6 | ||
| 135 | 6 | try: | 7 | try: |
| 136 | 7 | import json, sys, os, pwd, subprocess | 8 | import json, sys, os, pwd, subprocess |
| 137 | 8 | from ubuntuone.couch import auth | 9 | from ubuntuone.couch import auth |
| 138 | 9 | from launchpadlib.launchpad import Launchpad | 10 | from launchpadlib.launchpad import Launchpad |
| 139 | 10 | 11 | ||
| 144 | 11 | libaccom = libaccomplishments.Accomplishments() | 12 | api = dbusapi.Accomplishments() |
| 145 | 12 | 13 | f = api.getExtraInformation("ubuntu-community", "launchpad-email") | |
| 142 | 13 | f = libaccom.getExtraInformation("ubuntu-community", "launchpad-email") | ||
| 143 | 14 | |||
| 146 | 15 | if bool(f[0]["launchpad-email"]) == False: | 14 | if bool(f[0]["launchpad-email"]) == False: |
| 147 | 16 | sys.exit(4) | 15 | sys.exit(4) |
| 148 | 17 | else: | 16 | else: |
| 149 | 18 | email = f[0]["launchpad-email"] | 17 | email = f[0]["launchpad-email"] |
| 150 | 19 | 18 | ||
| 155 | 20 | # Get count of bugs reported by user from Launchpad, using email to identify | 19 | # Get count of bugs reported by user from Launchpad, using email to |
| 156 | 21 | l=Launchpad.login_anonymously('ubuntu-community accomplishments','production') | 20 | # identify |
| 157 | 22 | me=l.people.getByEmail(email=email) | 21 | l = Launchpad.login_anonymously( |
| 158 | 23 | 22 | 'ubuntu-community accomplishments', 'production') | |
| 159 | 23 | me = l.people.getByEmail(email=email) | ||
| 160 | 24 | if me == None: | 24 | if me == None: |
| 161 | 25 | sys.exit(1) | 25 | sys.exit(1) |
| 162 | 26 | else: | 26 | else: |
| 163 | 27 | ubuntu=l.projects['ubuntu'] | 27 | ubuntu=l.projects['ubuntu'] |
| 164 | 28 | bugs_reported = ubuntu.searchTasks(bug_reporter=me, | 28 | bugs_reported = ubuntu.searchTasks(bug_reporter=me, |
| 168 | 29 | status=['Confirmed', 'Triaged', | 29 | status=['Confirmed', 'Triaged', 'In Progress', 'Fix Committed', |
| 169 | 30 | 'In Progress', 'Fix Committed', 'Fix Released']) | 30 | 'Fix Released']) |
| 167 | 31 | |||
| 170 | 32 | if len(bugs_reported) > 0: | 31 | if len(bugs_reported) > 0: |
| 171 | 33 | sys.exit(0) | 32 | sys.exit(0) |
| 172 | 34 | else: | 33 | else: |
| 173 | @@ -39,4 +38,3 @@ | |||
| 174 | 39 | except: | 38 | except: |
| 175 | 40 | traceback.print_exc() | 39 | traceback.print_exc() |
| 176 | 41 | sys.exit(2) | 40 | sys.exit(2) |
| 177 | 42 | |||
| 178 | 43 | 41 | ||
| 179 | === modified file 'scripts/ubuntu-community/first-bug.py' | |||
| 180 | --- scripts/ubuntu-community/first-bug.py 2012-02-18 00:01:46 +0000 | |||
| 181 | +++ scripts/ubuntu-community/first-bug.py 2012-03-05 03:55:20 +0000 | |||
| 182 | @@ -1,34 +1,34 @@ | |||
| 183 | 1 | #!/usr/bin/python | 1 | #!/usr/bin/python |
| 184 | 2 | |||
| 185 | 3 | import traceback, sys | 2 | import traceback, sys |
| 187 | 4 | import libaccomplishments | 3 | |
| 188 | 4 | from accomplishments.daemon import dbusapi | ||
| 189 | 5 | |||
| 190 | 5 | 6 | ||
| 191 | 6 | try: | 7 | try: |
| 192 | 7 | import json, sys, os, pwd, subprocess | 8 | import json, sys, os, pwd, subprocess |
| 193 | 8 | from ubuntuone.couch import auth | 9 | from ubuntuone.couch import auth |
| 194 | 9 | from launchpadlib.launchpad import Launchpad | 10 | from launchpadlib.launchpad import Launchpad |
| 195 | 10 | 11 | ||
| 200 | 11 | libaccom = libaccomplishments.Accomplishments() | 12 | api = dbusapi.Accomplishments() |
| 201 | 12 | 13 | f = api.getExtraInformation("ubuntu-community", "launchpad-email") | |
| 198 | 13 | f = libaccom.getExtraInformation("ubuntu-community", "launchpad-email") | ||
| 199 | 14 | |||
| 202 | 15 | if bool(f[0]["launchpad-email"]) == False: | 14 | if bool(f[0]["launchpad-email"]) == False: |
| 203 | 16 | sys.exit(4) | 15 | sys.exit(4) |
| 204 | 17 | else: | 16 | else: |
| 205 | 18 | email = f[0]["launchpad-email"] | 17 | email = f[0]["launchpad-email"] |
| 206 | 19 | 18 | ||
| 211 | 20 | # Get count of bugs reported by user from Launchpad, using email to identify | 19 | # Get count of bugs reported by user from Launchpad, using email to |
| 212 | 21 | l=Launchpad.login_anonymously('ubuntu-community accomplishments','production') | 20 | # identify |
| 213 | 22 | me=l.people.getByEmail(email=email) | 21 | l = Launchpad.login_anonymously( |
| 214 | 23 | 22 | 'ubuntu-community accomplishments', 'production') | |
| 215 | 23 | me = l.people.getByEmail(email=email) | ||
| 216 | 24 | if me == None: | 24 | if me == None: |
| 217 | 25 | sys.exit(1) | 25 | sys.exit(1) |
| 218 | 26 | else: | 26 | else: |
| 219 | 27 | ubuntu=l.projects['ubuntu'] | 27 | ubuntu=l.projects['ubuntu'] |
| 220 | 28 | bugs_reported = ubuntu.searchTasks(bug_reporter=me, | 28 | bugs_reported = ubuntu.searchTasks(bug_reporter=me, |
| 221 | 29 | status=['New', 'Incomplete', 'Invalid', 'Confirmed', 'Triaged', | 29 | status=['New', 'Incomplete', 'Invalid', 'Confirmed', 'Triaged', |
| 224 | 30 | 'In Progress', 'Fix Committed', 'Fix Released', 'Opinion', "Won't Fix"]) | 30 | 'In Progress', 'Fix Committed', 'Fix Released', 'Opinion', |
| 225 | 31 | 31 | "Won't Fix"]) | |
| 226 | 32 | if len(bugs_reported) > 0: | 32 | if len(bugs_reported) > 0: |
| 227 | 33 | sys.exit(0) | 33 | sys.exit(0) |
| 228 | 34 | else: | 34 | else: |
| 229 | @@ -39,4 +39,3 @@ | |||
| 230 | 39 | except: | 39 | except: |
| 231 | 40 | traceback.print_exc() | 40 | traceback.print_exc() |
| 232 | 41 | sys.exit(2) | 41 | sys.exit(2) |
| 233 | 42 | |||
| 234 | 43 | 42 | ||
| 235 | === modified file 'scripts/ubuntu-community/fridge-editor.py' | |||
| 236 | --- scripts/ubuntu-community/fridge-editor.py 2012-02-22 01:10:42 +0000 | |||
| 237 | +++ scripts/ubuntu-community/fridge-editor.py 2012-03-05 03:55:20 +0000 | |||
| 238 | @@ -1,35 +1,31 @@ | |||
| 239 | 1 | #!/usr/bin/python | 1 | #!/usr/bin/python |
| 240 | 2 | |||
| 241 | 3 | import traceback, sys | 2 | import traceback, sys |
| 243 | 4 | import libaccomplishments | 3 | |
| 244 | 4 | from accomplishments.daemon import dbusapi | ||
| 245 | 5 | |||
| 246 | 5 | 6 | ||
| 247 | 6 | try: | 7 | try: |
| 248 | 7 | import json, sys, os, pwd, subprocess | 8 | import json, sys, os, pwd, subprocess |
| 249 | 8 | from ubuntuone.couch import auth | 9 | from ubuntuone.couch import auth |
| 250 | 9 | from launchpadlib.launchpad import Launchpad | 10 | from launchpadlib.launchpad import Launchpad |
| 251 | 10 | 11 | ||
| 256 | 11 | libaccom = libaccomplishments.Accomplishments() | 12 | api = dbusapi.Accomplishments() |
| 257 | 12 | 13 | f = api.getExtraInformation("ubuntu-community", "launchpad-email") | |
| 254 | 13 | f = libaccom.getExtraInformation("ubuntu-community", "launchpad-email") | ||
| 255 | 14 | |||
| 258 | 15 | if bool(f[0]["launchpad-email"]) == False: | 14 | if bool(f[0]["launchpad-email"]) == False: |
| 259 | 16 | sys.exit(4) | 15 | sys.exit(4) |
| 260 | 17 | else: | 16 | else: |
| 261 | 18 | email = f[0]["launchpad-email"] | 17 | email = f[0]["launchpad-email"] |
| 262 | 19 | 18 | ||
| 266 | 20 | lp=Launchpad.login_anonymously('ubuntu-community accomplishments','production') | 19 | lp = Launchpad.login_anonymously( |
| 267 | 21 | me=lp.people.getByEmail(email=email) | 20 | 'ubuntu-community accomplishments', 'production') |
| 268 | 22 | 21 | me = lp.people.getByEmail(email=email) | |
| 269 | 23 | if me == None: | 22 | if me == None: |
| 270 | 24 | sys.exit(1) | 23 | sys.exit(1) |
| 271 | 25 | else: | 24 | else: |
| 272 | 26 | user = me.name | 25 | user = me.name |
| 273 | 27 | |||
| 274 | 28 | teams = [team.name for team in lp.people['ubuntu-fridge'].sub_teams] | 26 | teams = [team.name for team in lp.people['ubuntu-fridge'].sub_teams] |
| 275 | 29 | |||
| 276 | 30 | if teams == []: | 27 | if teams == []: |
| 277 | 31 | teams.append(lp.people['ubuntu-fridge'].name) | 28 | teams.append(lp.people['ubuntu-fridge'].name) |
| 278 | 32 | |||
| 279 | 33 | try: | 29 | try: |
| 280 | 34 | memberships = [ | 30 | memberships = [ |
| 281 | 35 | membership for membership in | 31 | membership for membership in |
| 282 | @@ -38,7 +34,6 @@ | |||
| 283 | 38 | ['ubuntu-fridge'] + teams] | 34 | ['ubuntu-fridge'] + teams] |
| 284 | 39 | except KeyError: | 35 | except KeyError: |
| 285 | 40 | memberships = [] | 36 | memberships = [] |
| 286 | 41 | |||
| 287 | 42 | if memberships: | 37 | if memberships: |
| 288 | 43 | sys.exit(0) | 38 | sys.exit(0) |
| 289 | 44 | else: | 39 | else: |
| 290 | @@ -49,4 +44,3 @@ | |||
| 291 | 49 | except: | 44 | except: |
| 292 | 50 | traceback.print_exc() | 45 | traceback.print_exc() |
| 293 | 51 | sys.exit(2) | 46 | sys.exit(2) |
| 294 | 52 | |||
| 295 | 53 | 47 | ||
| 296 | === modified file 'scripts/ubuntu-community/juju-charm-contributor.py' | |||
| 297 | --- scripts/ubuntu-community/juju-charm-contributor.py 2012-02-21 03:39:06 +0000 | |||
| 298 | +++ scripts/ubuntu-community/juju-charm-contributor.py 2012-03-05 03:55:20 +0000 | |||
| 299 | @@ -1,35 +1,32 @@ | |||
| 300 | 1 | #!/usr/bin/python | 1 | #!/usr/bin/python |
| 301 | 2 | |||
| 302 | 3 | import traceback, sys | 2 | import traceback, sys |
| 304 | 4 | import libaccomplishments | 3 | |
| 305 | 4 | from accomplishments.daemon import dbusapi | ||
| 306 | 5 | |||
| 307 | 5 | 6 | ||
| 308 | 6 | try: | 7 | try: |
| 309 | 7 | import json, sys, os, pwd, subprocess | 8 | import json, sys, os, pwd, subprocess |
| 310 | 8 | from ubuntuone.couch import auth | 9 | from ubuntuone.couch import auth |
| 311 | 9 | from launchpadlib.launchpad import Launchpad | 10 | from launchpadlib.launchpad import Launchpad |
| 312 | 10 | 11 | ||
| 317 | 11 | libaccom = libaccomplishments.Accomplishments() | 12 | api = dbusapi.Accomplishments() |
| 318 | 12 | 13 | f = api.getExtraInformation("ubuntu-community", "launchpad-email") | |
| 315 | 13 | f = libaccom.getExtraInformation("ubuntu-community", "launchpad-email") | ||
| 316 | 14 | |||
| 319 | 15 | if bool(f[0]["launchpad-email"]) == False: | 14 | if bool(f[0]["launchpad-email"]) == False: |
| 320 | 16 | sys.exit(4) | 15 | sys.exit(4) |
| 321 | 17 | else: | 16 | else: |
| 322 | 18 | email = f[0]["launchpad-email"] | 17 | email = f[0]["launchpad-email"] |
| 323 | 19 | 18 | ||
| 327 | 20 | lp=Launchpad.login_anonymously('ubuntu-community accomplishments','production') | 19 | lp = Launchpad.login_anonymously( |
| 328 | 21 | me=lp.people.getByEmail(email=email) | 20 | 'ubuntu-community accomplishments', 'production') |
| 329 | 22 | 21 | me = lp.people.getByEmail(email=email) | |
| 330 | 23 | if me == None: | 22 | if me == None: |
| 331 | 24 | sys.exit(1) | 23 | sys.exit(1) |
| 332 | 25 | else: | 24 | else: |
| 333 | 26 | user = me.name | 25 | user = me.name |
| 337 | 27 | 26 | teams = [team.name for team in | |
| 338 | 28 | teams = [team.name for team in lp.people['charm-contributors'].sub_teams] | 27 | lp.people['charm-contributors'].sub_teams] |
| 336 | 29 | |||
| 339 | 30 | if teams == []: | 28 | if teams == []: |
| 340 | 31 | teams.append(lp.people['charm-contributors'].name) | 29 | teams.append(lp.people['charm-contributors'].name) |
| 341 | 32 | |||
| 342 | 33 | try: | 30 | try: |
| 343 | 34 | memberships = [ | 31 | memberships = [ |
| 344 | 35 | membership for membership in | 32 | membership for membership in |
| 345 | @@ -38,7 +35,6 @@ | |||
| 346 | 38 | ['charm-contributors'] + teams] | 35 | ['charm-contributors'] + teams] |
| 347 | 39 | except KeyError: | 36 | except KeyError: |
| 348 | 40 | memberships = [] | 37 | memberships = [] |
| 349 | 41 | |||
| 350 | 42 | if memberships: | 38 | if memberships: |
| 351 | 43 | sys.exit(0) | 39 | sys.exit(0) |
| 352 | 44 | else: | 40 | else: |
| 353 | @@ -49,4 +45,3 @@ | |||
| 354 | 49 | except: | 45 | except: |
| 355 | 50 | traceback.print_exc() | 46 | traceback.print_exc() |
| 356 | 51 | sys.exit(2) | 47 | sys.exit(2) |
| 357 | 52 | |||
| 358 | 53 | 48 | ||
| 359 | === modified file 'scripts/ubuntu-community/juju-charm-reviewer.py' | |||
| 360 | --- scripts/ubuntu-community/juju-charm-reviewer.py 2012-02-21 03:39:06 +0000 | |||
| 361 | +++ scripts/ubuntu-community/juju-charm-reviewer.py 2012-03-05 03:55:20 +0000 | |||
| 362 | @@ -1,35 +1,30 @@ | |||
| 363 | 1 | #!/usr/bin/python | 1 | #!/usr/bin/python |
| 364 | 2 | |||
| 365 | 3 | import traceback, sys | 2 | import traceback, sys |
| 367 | 4 | import libaccomplishments | 3 | |
| 368 | 4 | from accomplishments.daemon import dbusapi | ||
| 369 | 5 | |||
| 370 | 5 | 6 | ||
| 371 | 6 | try: | 7 | try: |
| 372 | 7 | import json, sys, os, pwd, subprocess | 8 | import json, sys, os, pwd, subprocess |
| 373 | 8 | from ubuntuone.couch import auth | 9 | from ubuntuone.couch import auth |
| 374 | 9 | from launchpadlib.launchpad import Launchpad | 10 | from launchpadlib.launchpad import Launchpad |
| 375 | 10 | 11 | ||
| 380 | 11 | libaccom = libaccomplishments.Accomplishments() | 12 | api = dbusapi.Accomplishments() |
| 381 | 12 | 13 | f = api.getExtraInformation("ubuntu-community", "launchpad-email") | |
| 378 | 13 | f = libaccom.getExtraInformation("ubuntu-community", "launchpad-email") | ||
| 379 | 14 | |||
| 382 | 15 | if bool(f[0]["launchpad-email"]) == False: | 14 | if bool(f[0]["launchpad-email"]) == False: |
| 383 | 16 | sys.exit(4) | 15 | sys.exit(4) |
| 384 | 17 | else: | 16 | else: |
| 385 | 18 | email = f[0]["launchpad-email"] | 17 | email = f[0]["launchpad-email"] |
| 390 | 19 | 18 | lp = Launchpad.login_anonymously( | |
| 391 | 20 | lp=Launchpad.login_anonymously('ubuntu-community accomplishments','production') | 19 | 'ubuntu-community accomplishments', 'production') |
| 392 | 21 | me=lp.people.getByEmail(email=email) | 20 | me = lp.people.getByEmail(email=email) |
| 389 | 22 | |||
| 393 | 23 | if me == None: | 21 | if me == None: |
| 394 | 24 | sys.exit(1) | 22 | sys.exit(1) |
| 395 | 25 | else: | 23 | else: |
| 396 | 26 | user = me.name | 24 | user = me.name |
| 397 | 27 | |||
| 398 | 28 | teams = [team.name for team in lp.people['charmers'].sub_teams] | 25 | teams = [team.name for team in lp.people['charmers'].sub_teams] |
| 399 | 29 | |||
| 400 | 30 | if teams == []: | 26 | if teams == []: |
| 401 | 31 | teams.append(lp.people['charmers'].name) | 27 | teams.append(lp.people['charmers'].name) |
| 402 | 32 | |||
| 403 | 33 | try: | 28 | try: |
| 404 | 34 | memberships = [ | 29 | memberships = [ |
| 405 | 35 | membership for membership in | 30 | membership for membership in |
| 406 | @@ -38,7 +33,6 @@ | |||
| 407 | 38 | ['charmers'] + teams] | 33 | ['charmers'] + teams] |
| 408 | 39 | except KeyError: | 34 | except KeyError: |
| 409 | 40 | memberships = [] | 35 | memberships = [] |
| 410 | 41 | |||
| 411 | 42 | if memberships: | 36 | if memberships: |
| 412 | 43 | sys.exit(0) | 37 | sys.exit(0) |
| 413 | 44 | else: | 38 | else: |
| 414 | @@ -49,4 +43,3 @@ | |||
| 415 | 49 | except: | 43 | except: |
| 416 | 50 | traceback.print_exc() | 44 | traceback.print_exc() |
| 417 | 51 | sys.exit(2) | 45 | sys.exit(2) |
| 418 | 52 | |||
| 419 | 53 | 46 | ||
| 420 | === modified file 'scripts/ubuntu-community/loco-council-member.py' | |||
| 421 | --- scripts/ubuntu-community/loco-council-member.py 2012-02-24 00:08:50 +0000 | |||
| 422 | +++ scripts/ubuntu-community/loco-council-member.py 2012-03-05 03:55:20 +0000 | |||
| 423 | @@ -1,35 +1,31 @@ | |||
| 424 | 1 | #!/usr/bin/python | 1 | #!/usr/bin/python |
| 425 | 2 | |||
| 426 | 3 | import traceback, sys | 2 | import traceback, sys |
| 428 | 4 | import libaccomplishments | 3 | |
| 429 | 4 | from accomplishments.daemon import dbusapi | ||
| 430 | 5 | |||
| 431 | 5 | 6 | ||
| 432 | 6 | try: | 7 | try: |
| 433 | 7 | import json, sys, os, pwd, subprocess | 8 | import json, sys, os, pwd, subprocess |
| 434 | 8 | from ubuntuone.couch import auth | 9 | from ubuntuone.couch import auth |
| 435 | 9 | from launchpadlib.launchpad import Launchpad | 10 | from launchpadlib.launchpad import Launchpad |
| 436 | 10 | 11 | ||
| 441 | 11 | libaccom = libaccomplishments.Accomplishments() | 12 | api = dbusapi.Accomplishments() |
| 442 | 12 | 13 | f = api.getExtraInformation("ubuntu-community", "launchpad-email") | |
| 439 | 13 | f = libaccom.getExtraInformation("ubuntu-community", "launchpad-email") | ||
| 440 | 14 | |||
| 443 | 15 | if bool(f[0]["launchpad-email"]) == False: | 14 | if bool(f[0]["launchpad-email"]) == False: |
| 444 | 16 | sys.exit(4) | 15 | sys.exit(4) |
| 445 | 17 | else: | 16 | else: |
| 446 | 18 | email = f[0]["launchpad-email"] | 17 | email = f[0]["launchpad-email"] |
| 451 | 19 | 18 | lp = Launchpad.login_anonymously( | |
| 452 | 20 | lp=Launchpad.login_anonymously('ubuntu-community accomplishments','production') | 19 | 'ubuntu-community accomplishments', 'production') |
| 453 | 21 | me=lp.people.getByEmail(email=email) | 20 | me = lp.people.getByEmail(email=email) |
| 450 | 22 | |||
| 454 | 23 | if me == None: | 21 | if me == None: |
| 455 | 24 | sys.exit(1) | 22 | sys.exit(1) |
| 456 | 25 | else: | 23 | else: |
| 457 | 26 | user = me.name | 24 | user = me.name |
| 461 | 27 | 25 | teams = [team.name for team in | |
| 462 | 28 | teams = [team.name for team in lp.people['ubuntu-lococouncil'].sub_teams] | 26 | lp.people['ubuntu-lococouncil'].sub_teams] |
| 460 | 29 | |||
| 463 | 30 | if teams == []: | 27 | if teams == []: |
| 464 | 31 | teams.append(lp.people['ubuntu-lococouncil'].name) | 28 | teams.append(lp.people['ubuntu-lococouncil'].name) |
| 465 | 32 | |||
| 466 | 33 | try: | 29 | try: |
| 467 | 34 | memberships = [ | 30 | memberships = [ |
| 468 | 35 | membership for membership in | 31 | membership for membership in |
| 469 | @@ -38,7 +34,6 @@ | |||
| 470 | 38 | ['ubuntu-lococouncil'] + teams] | 34 | ['ubuntu-lococouncil'] + teams] |
| 471 | 39 | except KeyError: | 35 | except KeyError: |
| 472 | 40 | memberships = [] | 36 | memberships = [] |
| 473 | 41 | |||
| 474 | 42 | if memberships: | 37 | if memberships: |
| 475 | 43 | sys.exit(0) | 38 | sys.exit(0) |
| 476 | 44 | else: | 39 | else: |
| 477 | @@ -49,4 +44,3 @@ | |||
| 478 | 49 | except: | 44 | except: |
| 479 | 50 | traceback.print_exc() | 45 | traceback.print_exc() |
| 480 | 51 | sys.exit(2) | 46 | sys.exit(2) |
| 481 | 52 | |||
| 482 | 53 | 47 | ||
| 483 | === modified file 'scripts/ubuntu-community/member-loco-team.py' | |||
| 484 | --- scripts/ubuntu-community/member-loco-team.py 2012-02-23 06:57:16 +0000 | |||
| 485 | +++ scripts/ubuntu-community/member-loco-team.py 2012-03-05 03:55:20 +0000 | |||
| 486 | @@ -1,25 +1,23 @@ | |||
| 487 | 1 | #!/usr/bin/python | 1 | #!/usr/bin/python |
| 488 | 2 | |||
| 489 | 3 | import traceback, sys | 2 | import traceback, sys |
| 491 | 4 | import libaccomplishments | 3 | |
| 492 | 4 | from accomplishments.daemon import dbusapi | ||
| 493 | 5 | |||
| 494 | 5 | 6 | ||
| 495 | 6 | try: | 7 | try: |
| 496 | 7 | import json, sys, os, pwd, subprocess | 8 | import json, sys, os, pwd, subprocess |
| 497 | 8 | from ubuntuone.couch import auth | 9 | from ubuntuone.couch import auth |
| 498 | 9 | from launchpadlib.launchpad import Launchpad | 10 | from launchpadlib.launchpad import Launchpad |
| 499 | 10 | 11 | ||
| 504 | 11 | libaccom = libaccomplishments.Accomplishments() | 12 | api = dbusapi.Accomplishments() |
| 505 | 12 | 13 | f = api.getExtraInformation("ubuntu-community", "launchpad-email") | |
| 502 | 13 | f = libaccom.getExtraInformation("ubuntu-community", "launchpad-email") | ||
| 503 | 14 | |||
| 506 | 15 | if bool(f[0]["launchpad-email"]) == False: | 14 | if bool(f[0]["launchpad-email"]) == False: |
| 507 | 16 | sys.exit(2) | 15 | sys.exit(2) |
| 508 | 17 | else: | 16 | else: |
| 509 | 18 | email = f[0]["launchpad-email"] | 17 | email = f[0]["launchpad-email"] |
| 514 | 19 | 18 | lp = Launchpad.login_anonymously( | |
| 515 | 20 | lp=Launchpad.login_anonymously('ubuntu-community accomplishments','production') | 19 | 'ubuntu-community accomplishments', 'production') |
| 516 | 21 | me=lp.people.getByEmail(email=email) | 20 | me = lp.people.getByEmail(email=email) |
| 513 | 22 | |||
| 517 | 23 | if me == None: | 21 | if me == None: |
| 518 | 24 | sys.exit(1) | 22 | sys.exit(1) |
| 519 | 25 | else: | 23 | else: |
| 520 | @@ -29,15 +27,13 @@ | |||
| 521 | 29 | for sup in team.super_teams: | 27 | for sup in team.super_teams: |
| 522 | 30 | if "locoteams" in sup.self_link.rsplit('~', 1)[-1]: | 28 | if "locoteams" in sup.self_link.rsplit('~', 1)[-1]: |
| 523 | 31 | final.append(sup) | 29 | final.append(sup) |
| 524 | 32 | |||
| 525 | 33 | if len(final) is not 0: | 30 | if len(final) is not 0: |
| 526 | 34 | sys.exit(0) | 31 | sys.exit(0) |
| 527 | 35 | else: | 32 | else: |
| 528 | 36 | sys.exit(1) | 33 | sys.exit(1) |
| 530 | 37 | 34 | ||
| 531 | 38 | except SystemExit, e: | 35 | except SystemExit, e: |
| 532 | 39 | sys.exit(e.code) | 36 | sys.exit(e.code) |
| 533 | 40 | except: | 37 | except: |
| 534 | 41 | traceback.print_exc() | 38 | traceback.print_exc() |
| 535 | 42 | sys.exit(2) | 39 | sys.exit(2) |
| 536 | 43 | |||
| 537 | 44 | 40 | ||
| 538 | === modified file 'scripts/ubuntu-community/motu.py' | |||
| 539 | --- scripts/ubuntu-community/motu.py 2012-02-21 03:39:06 +0000 | |||
| 540 | +++ scripts/ubuntu-community/motu.py 2012-03-05 03:55:20 +0000 | |||
| 541 | @@ -1,35 +1,30 @@ | |||
| 542 | 1 | #!/usr/bin/python | 1 | #!/usr/bin/python |
| 543 | 2 | |||
| 544 | 3 | import traceback, sys | 2 | import traceback, sys |
| 546 | 4 | import libaccomplishments | 3 | |
| 547 | 4 | from accomplishments.daemon import dbusapi | ||
| 548 | 5 | |||
| 549 | 5 | 6 | ||
| 550 | 6 | try: | 7 | try: |
| 551 | 7 | import json, sys, os, pwd, subprocess | 8 | import json, sys, os, pwd, subprocess |
| 552 | 8 | from ubuntuone.couch import auth | 9 | from ubuntuone.couch import auth |
| 553 | 9 | from launchpadlib.launchpad import Launchpad | 10 | from launchpadlib.launchpad import Launchpad |
| 554 | 10 | 11 | ||
| 559 | 11 | libaccom = libaccomplishments.Accomplishments() | 12 | api = dbusapi.Accomplishments() |
| 560 | 12 | 13 | f = api.getExtraInformation("ubuntu-community", "launchpad-email") | |
| 557 | 13 | f = libaccom.getExtraInformation("ubuntu-community", "launchpad-email") | ||
| 558 | 14 | |||
| 561 | 15 | if bool(f[0]["launchpad-email"]) == False: | 14 | if bool(f[0]["launchpad-email"]) == False: |
| 562 | 16 | sys.exit(4) | 15 | sys.exit(4) |
| 563 | 17 | else: | 16 | else: |
| 564 | 18 | email = f[0]["launchpad-email"] | 17 | email = f[0]["launchpad-email"] |
| 569 | 19 | 18 | lp = Launchpad.login_anonymously( | |
| 570 | 20 | lp=Launchpad.login_anonymously('ubuntu-community accomplishments','production') | 19 | 'ubuntu-community accomplishments', 'production') |
| 571 | 21 | me=lp.people.getByEmail(email=email) | 20 | me = lp.people.getByEmail(email=email) |
| 568 | 22 | |||
| 572 | 23 | if me == None: | 21 | if me == None: |
| 573 | 24 | sys.exit(1) | 22 | sys.exit(1) |
| 574 | 25 | else: | 23 | else: |
| 575 | 26 | user = me.name | 24 | user = me.name |
| 576 | 27 | |||
| 577 | 28 | teams = [team.name for team in lp.people['motu'].sub_teams] | 25 | teams = [team.name for team in lp.people['motu'].sub_teams] |
| 578 | 29 | |||
| 579 | 30 | if teams == []: | 26 | if teams == []: |
| 580 | 31 | teams.append(lp.people['motu'].name) | 27 | teams.append(lp.people['motu'].name) |
| 581 | 32 | |||
| 582 | 33 | try: | 28 | try: |
| 583 | 34 | memberships = [ | 29 | memberships = [ |
| 584 | 35 | membership for membership in | 30 | membership for membership in |
| 585 | @@ -38,7 +33,6 @@ | |||
| 586 | 38 | ['motu'] + teams] | 33 | ['motu'] + teams] |
| 587 | 39 | except KeyError: | 34 | except KeyError: |
| 588 | 40 | memberships = [] | 35 | memberships = [] |
| 589 | 41 | |||
| 590 | 42 | if memberships: | 36 | if memberships: |
| 591 | 43 | sys.exit(0) | 37 | sys.exit(0) |
| 592 | 44 | else: | 38 | else: |
| 593 | @@ -49,4 +43,3 @@ | |||
| 594 | 49 | except: | 43 | except: |
| 595 | 50 | traceback.print_exc() | 44 | traceback.print_exc() |
| 596 | 51 | sys.exit(2) | 45 | sys.exit(2) |
| 597 | 52 | |||
| 598 | 53 | 46 | ||
| 599 | === modified file 'scripts/ubuntu-community/registered-on-launchpad.py' | |||
| 600 | --- scripts/ubuntu-community/registered-on-launchpad.py 2012-02-15 22:14:37 +0000 | |||
| 601 | +++ scripts/ubuntu-community/registered-on-launchpad.py 2012-03-05 03:55:20 +0000 | |||
| 602 | @@ -1,26 +1,25 @@ | |||
| 603 | 1 | #!/usr/bin/python | 1 | #!/usr/bin/python |
| 604 | 2 | |||
| 605 | 3 | import traceback, sys | 2 | import traceback, sys |
| 607 | 4 | import libaccomplishments | 3 | |
| 608 | 4 | from accomplishments.daemon import dbusapi | ||
| 609 | 5 | |||
| 610 | 5 | 6 | ||
| 611 | 6 | try: | 7 | try: |
| 612 | 7 | import json, sys, os, pwd, subprocess | 8 | import json, sys, os, pwd, subprocess |
| 613 | 8 | from ubuntuone.couch import auth | 9 | from ubuntuone.couch import auth |
| 614 | 9 | from launchpadlib.launchpad import Launchpad | 10 | from launchpadlib.launchpad import Launchpad |
| 615 | 10 | 11 | ||
| 620 | 11 | libaccom = libaccomplishments.Accomplishments() | 12 | api = dbusapi.Accomplishments() |
| 621 | 12 | 13 | f = api.getExtraInformation("ubuntu-community", "launchpad-email") | |
| 618 | 13 | f = libaccom.getExtraInformation("ubuntu-community", "launchpad-email") | ||
| 619 | 14 | |||
| 622 | 15 | if bool(f[0]["launchpad-email"]) == False: | 14 | if bool(f[0]["launchpad-email"]) == False: |
| 623 | 16 | sys.exit(4) | 15 | sys.exit(4) |
| 624 | 17 | else: | 16 | else: |
| 625 | 18 | email = f[0]["launchpad-email"] | 17 | email = f[0]["launchpad-email"] |
| 631 | 19 | 18 | # Get count of bugs reported by user from Launchpad, using email to | |
| 632 | 20 | # Get count of bugs reported by user from Launchpad, using email to identify | 19 | # identify |
| 633 | 21 | l=Launchpad.login_anonymously('ubuntu-community accomplishments','production') | 20 | l = Launchpad.login_anonymously( |
| 634 | 22 | me=l.people.getByEmail(email=email) | 21 | 'ubuntu-community accomplishments', 'production') |
| 635 | 23 | 22 | me = l.people.getByEmail(email=email) | |
| 636 | 24 | if me == None: | 23 | if me == None: |
| 637 | 25 | sys.exit(1) | 24 | sys.exit(1) |
| 638 | 26 | else: | 25 | else: |
| 639 | @@ -31,4 +30,3 @@ | |||
| 640 | 31 | except: | 30 | except: |
| 641 | 32 | traceback.print_exc() | 31 | traceback.print_exc() |
| 642 | 33 | sys.exit(2) | 32 | sys.exit(2) |
| 643 | 34 | |||
| 644 | 35 | 33 | ||
| 645 | === modified file 'scripts/ubuntu-community/signed-code-of-conduct.py' | |||
| 646 | --- scripts/ubuntu-community/signed-code-of-conduct.py 2012-02-23 23:42:28 +0000 | |||
| 647 | +++ scripts/ubuntu-community/signed-code-of-conduct.py 2012-03-05 03:55:20 +0000 | |||
| 648 | @@ -1,25 +1,23 @@ | |||
| 649 | 1 | #!/usr/bin/python | 1 | #!/usr/bin/python |
| 650 | 2 | |||
| 651 | 3 | import traceback, sys | 2 | import traceback, sys |
| 653 | 4 | import libaccomplishments | 3 | |
| 654 | 4 | from accomplishments.daemon import dbusapi | ||
| 655 | 5 | |||
| 656 | 5 | 6 | ||
| 657 | 6 | try: | 7 | try: |
| 658 | 7 | import json, sys, os, pwd, subprocess | 8 | import json, sys, os, pwd, subprocess |
| 659 | 8 | from ubuntuone.couch import auth | 9 | from ubuntuone.couch import auth |
| 660 | 9 | from launchpadlib.launchpad import Launchpad | 10 | from launchpadlib.launchpad import Launchpad |
| 661 | 10 | 11 | ||
| 666 | 11 | libaccom = libaccomplishments.Accomplishments() | 12 | api = dbusapi.Accomplishments() |
| 667 | 12 | 13 | f = api.getExtraInformation("ubuntu-community", "launchpad-email") | |
| 664 | 13 | f = libaccom.getExtraInformation("ubuntu-community", "launchpad-email") | ||
| 665 | 14 | |||
| 668 | 15 | if bool(f[0]["launchpad-email"]) == False: | 14 | if bool(f[0]["launchpad-email"]) == False: |
| 669 | 16 | sys.exit(4) | 15 | sys.exit(4) |
| 670 | 17 | else: | 16 | else: |
| 671 | 18 | email = f[0]["launchpad-email"] | 17 | email = f[0]["launchpad-email"] |
| 676 | 19 | 18 | lp = Launchpad.login_anonymously( | |
| 677 | 20 | lp=Launchpad.login_anonymously('ubuntu-community accomplishments','production') | 19 | 'ubuntu-community accomplishments', 'production') |
| 678 | 21 | me=lp.people.getByEmail(email=email) | 20 | me = lp.people.getByEmail(email=email) |
| 675 | 22 | |||
| 679 | 23 | if me == None: | 21 | if me == None: |
| 680 | 24 | sys.exit(1) | 22 | sys.exit(1) |
| 681 | 25 | else: | 23 | else: |
| 682 | @@ -33,4 +31,3 @@ | |||
| 683 | 33 | except: | 31 | except: |
| 684 | 34 | traceback.print_exc() | 32 | traceback.print_exc() |
| 685 | 35 | sys.exit(2) | 33 | sys.exit(2) |
| 686 | 36 | |||
| 687 | 37 | 34 | ||
| 688 | === modified file 'scripts/ubuntu-community/technical-board-member.py' | |||
| 689 | --- scripts/ubuntu-community/technical-board-member.py 2012-02-24 00:08:50 +0000 | |||
| 690 | +++ scripts/ubuntu-community/technical-board-member.py 2012-03-05 03:55:20 +0000 | |||
| 691 | @@ -1,35 +1,30 @@ | |||
| 692 | 1 | #!/usr/bin/python | 1 | #!/usr/bin/python |
| 693 | 2 | |||
| 694 | 3 | import traceback, sys | 2 | import traceback, sys |
| 696 | 4 | import libaccomplishments | 3 | |
| 697 | 4 | from accomplishments.daemon import dbusapi | ||
| 698 | 5 | |||
| 699 | 5 | 6 | ||
| 700 | 6 | try: | 7 | try: |
| 701 | 7 | import json, sys, os, pwd, subprocess | 8 | import json, sys, os, pwd, subprocess |
| 702 | 8 | from ubuntuone.couch import auth | 9 | from ubuntuone.couch import auth |
| 703 | 9 | from launchpadlib.launchpad import Launchpad | 10 | from launchpadlib.launchpad import Launchpad |
| 704 | 10 | 11 | ||
| 709 | 11 | libaccom = libaccomplishments.Accomplishments() | 12 | api = dbusapi.Accomplishments() |
| 710 | 12 | 13 | f = api.getExtraInformation("ubuntu-community", "launchpad-email") | |
| 707 | 13 | f = libaccom.getExtraInformation("ubuntu-community", "launchpad-email") | ||
| 708 | 14 | |||
| 711 | 15 | if bool(f[0]["launchpad-email"]) == False: | 14 | if bool(f[0]["launchpad-email"]) == False: |
| 712 | 16 | sys.exit(4) | 15 | sys.exit(4) |
| 713 | 17 | else: | 16 | else: |
| 714 | 18 | email = f[0]["launchpad-email"] | 17 | email = f[0]["launchpad-email"] |
| 719 | 19 | 18 | lp = Launchpad.login_anonymously( | |
| 720 | 20 | lp=Launchpad.login_anonymously('ubuntu-community accomplishments','production') | 19 | 'ubuntu-community accomplishments', 'production') |
| 721 | 21 | me=lp.people.getByEmail(email=email) | 20 | me = lp.people.getByEmail(email=email) |
| 718 | 22 | |||
| 722 | 23 | if me == None: | 21 | if me == None: |
| 723 | 24 | sys.exit(1) | 22 | sys.exit(1) |
| 724 | 25 | else: | 23 | else: |
| 725 | 26 | user = me.name | 24 | user = me.name |
| 726 | 27 | |||
| 727 | 28 | teams = [team.name for team in lp.people['techboard'].sub_teams] | 25 | teams = [team.name for team in lp.people['techboard'].sub_teams] |
| 728 | 29 | |||
| 729 | 30 | if teams == []: | 26 | if teams == []: |
| 730 | 31 | teams.append(lp.people['techboard'].name) | 27 | teams.append(lp.people['techboard'].name) |
| 731 | 32 | |||
| 732 | 33 | try: | 28 | try: |
| 733 | 34 | memberships = [ | 29 | memberships = [ |
| 734 | 35 | membership for membership in | 30 | membership for membership in |
| 735 | @@ -38,7 +33,6 @@ | |||
| 736 | 38 | ['techboard'] + teams] | 33 | ['techboard'] + teams] |
| 737 | 39 | except KeyError: | 34 | except KeyError: |
| 738 | 40 | memberships = [] | 35 | memberships = [] |
| 739 | 41 | |||
| 740 | 42 | if memberships: | 36 | if memberships: |
| 741 | 43 | sys.exit(0) | 37 | sys.exit(0) |
| 742 | 44 | else: | 38 | else: |
| 743 | @@ -49,4 +43,3 @@ | |||
| 744 | 49 | except: | 43 | except: |
| 745 | 50 | traceback.print_exc() | 44 | traceback.print_exc() |
| 746 | 51 | sys.exit(2) | 45 | sys.exit(2) |
| 747 | 52 | |||
| 748 | 53 | 46 | ||
| 749 | === modified file 'scripts/ubuntu-community/ubuntu-member.py' | |||
| 750 | --- scripts/ubuntu-community/ubuntu-member.py 2012-02-21 03:39:06 +0000 | |||
| 751 | +++ scripts/ubuntu-community/ubuntu-member.py 2012-03-05 03:55:20 +0000 | |||
| 752 | @@ -1,35 +1,30 @@ | |||
| 753 | 1 | #!/usr/bin/python | 1 | #!/usr/bin/python |
| 754 | 2 | |||
| 755 | 3 | import traceback, sys | 2 | import traceback, sys |
| 757 | 4 | import libaccomplishments | 3 | |
| 758 | 4 | from accomplishments.daemon import dbusapi | ||
| 759 | 5 | |||
| 760 | 5 | 6 | ||
| 761 | 6 | try: | 7 | try: |
| 762 | 7 | import json, sys, os, pwd, subprocess | 8 | import json, sys, os, pwd, subprocess |
| 763 | 8 | from ubuntuone.couch import auth | 9 | from ubuntuone.couch import auth |
| 764 | 9 | from launchpadlib.launchpad import Launchpad | 10 | from launchpadlib.launchpad import Launchpad |
| 765 | 10 | 11 | ||
| 770 | 11 | libaccom = libaccomplishments.Accomplishments() | 12 | api = dbusapi.Accomplishments() |
| 771 | 12 | 13 | f = api.getExtraInformation("ubuntu-community", "launchpad-email") | |
| 768 | 13 | f = libaccom.getExtraInformation("ubuntu-community", "launchpad-email") | ||
| 769 | 14 | |||
| 772 | 15 | if bool(f[0]["launchpad-email"]) == False: | 14 | if bool(f[0]["launchpad-email"]) == False: |
| 773 | 16 | sys.exit(4) | 15 | sys.exit(4) |
| 774 | 17 | else: | 16 | else: |
| 775 | 18 | email = f[0]["launchpad-email"] | 17 | email = f[0]["launchpad-email"] |
| 780 | 19 | 18 | lp = Launchpad.login_anonymously( | |
| 781 | 20 | lp=Launchpad.login_anonymously('ubuntu-community accomplishments','production') | 19 | 'ubuntu-community accomplishments', 'production') |
| 782 | 21 | me=lp.people.getByEmail(email=email) | 20 | me = lp.people.getByEmail(email=email) |
| 779 | 22 | |||
| 783 | 23 | if me == None: | 21 | if me == None: |
| 784 | 24 | sys.exit(1) | 22 | sys.exit(1) |
| 785 | 25 | else: | 23 | else: |
| 786 | 26 | user = me.name | 24 | user = me.name |
| 787 | 27 | |||
| 788 | 28 | teams = [team.name for team in lp.people['ubuntumembers'].sub_teams] | 25 | teams = [team.name for team in lp.people['ubuntumembers'].sub_teams] |
| 789 | 29 | |||
| 790 | 30 | if teams == []: | 26 | if teams == []: |
| 791 | 31 | teams.append(lp.people['ubuntumembers'].name) | 27 | teams.append(lp.people['ubuntumembers'].name) |
| 792 | 32 | |||
| 793 | 33 | try: | 28 | try: |
| 794 | 34 | memberships = [ | 29 | memberships = [ |
| 795 | 35 | membership for membership in | 30 | membership for membership in |
| 796 | @@ -38,7 +33,6 @@ | |||
| 797 | 38 | ['ubuntumembers'] + teams] | 33 | ['ubuntumembers'] + teams] |
| 798 | 39 | except KeyError: | 34 | except KeyError: |
| 799 | 40 | memberships = [] | 35 | memberships = [] |
| 800 | 41 | |||
| 801 | 42 | if memberships: | 36 | if memberships: |
| 802 | 43 | sys.exit(0) | 37 | sys.exit(0) |
| 803 | 44 | else: | 38 | else: |
| 804 | @@ -49,4 +43,3 @@ | |||
| 805 | 49 | except: | 43 | except: |
| 806 | 50 | traceback.print_exc() | 44 | traceback.print_exc() |
| 807 | 51 | sys.exit(2) | 45 | sys.exit(2) |
| 808 | 52 | |||
Looks like this was mean't to go into lp:ubuntu-accomplishments-system instead. Rejecting: feel free to re-post the MP there.