Commit e0d32ecb91fe8394937ca2d9e19be79a4a304435
Exists in
master
and in
1 other branch
Merge branch 'master' of https://github.com/tassia/AppRecommender
Showing
1 changed file
with
8 additions
and
8 deletions
Show diff stats
src/data.py
@@ -209,12 +209,12 @@ class DebianPackage(): | @@ -209,12 +209,12 @@ class DebianPackage(): | ||
209 | if pkg_version.record.has_key('Conflicts'): | 209 | if pkg_version.record.has_key('Conflicts'): |
210 | self.conflicts = pkg_version.record['Conflicts'] | 210 | self.conflicts = pkg_version.record['Conflicts'] |
211 | if pkg_version.record.has_key('Replaces'): | 211 | if pkg_version.record.has_key('Replaces'): |
212 | - self.conflicts = pkg_version.record['Replaces'] | 212 | + self.replaces = pkg_version.record['Replaces'] |
213 | if pkg_version.record.has_key('Provides'): | 213 | if pkg_version.record.has_key('Provides'): |
214 | self.provides = pkg_version.record['Provides'] | 214 | self.provides = pkg_version.record['Provides'] |
215 | 215 | ||
216 | def load_details_from_dde(self,dde_server,dde_port): | 216 | def load_details_from_dde(self,dde_server,dde_port): |
217 | - json_data = json.load(urllib.urlopen("http://%s:%d/q/udd/packages/all/%s?t=json" | 217 | + json_data = json.load(urllib.urlopen("http://%s:%d/q/udd/packages/prio-debian-sid/%s?t=json" |
218 | % (dde_server,dde_port,self.name))) | 218 | % (dde_server,dde_port,self.name))) |
219 | 219 | ||
220 | self.maintainer = json_data['r']['maintainer'] | 220 | self.maintainer = json_data['r']['maintainer'] |
@@ -223,23 +223,23 @@ class DebianPackage(): | @@ -223,23 +223,23 @@ class DebianPackage(): | ||
223 | self.description = self.format_description(json_data['r']['long_description']) | 223 | self.description = self.format_description(json_data['r']['long_description']) |
224 | self.section = json_data['r']['section'] | 224 | self.section = json_data['r']['section'] |
225 | if json_data['r']['homepage']: | 225 | if json_data['r']['homepage']: |
226 | - self.conflicts = json_data['r']['homepage'] | 226 | + self.homepage = json_data['r']['homepage'] |
227 | if json_data['r']['tag']: | 227 | if json_data['r']['tag']: |
228 | self.tags = self.debtags_list_to_dict(json_data['r']['tag']) | 228 | self.tags = self.debtags_list_to_dict(json_data['r']['tag']) |
229 | if json_data['r']['depends']: | 229 | if json_data['r']['depends']: |
230 | self.depends = json_data['r']['depends'] | 230 | self.depends = json_data['r']['depends'] |
231 | if json_data['r']['pre_depends']: | 231 | if json_data['r']['pre_depends']: |
232 | - self.conflicts = json_data['r']['pre_depends'] | 232 | + self.predepends = json_data['r']['pre_depends'] |
233 | if json_data['r']['recommends']: | 233 | if json_data['r']['recommends']: |
234 | - self.conflicts = json_data['r']['recommends'] | 234 | + self.recommends = json_data['r']['recommends'] |
235 | if json_data['r']['suggests']: | 235 | if json_data['r']['suggests']: |
236 | - self.conflicts = json_data['r']['suggests'] | 236 | + self.suggests = json_data['r']['suggests'] |
237 | if json_data['r']['conflicts']: | 237 | if json_data['r']['conflicts']: |
238 | self.conflicts = json_data['r']['conflicts'] | 238 | self.conflicts = json_data['r']['conflicts'] |
239 | if json_data['r']['replaces']: | 239 | if json_data['r']['replaces']: |
240 | - self.conflicts = json_data['r']['replaces'] | 240 | + self.replaces = json_data['r']['replaces'] |
241 | if json_data['r']['provides']: | 241 | if json_data['r']['provides']: |
242 | - self.conflicts = json_data['r']['provides'] | 242 | + self.provides = json_data['r']['provides'] |
243 | self.popcon_insts = json_data['r']['popcon']['insts'] | 243 | self.popcon_insts = json_data['r']['popcon']['insts'] |
244 | 244 | ||
245 | def format_description(self,description): | 245 | def format_description(self,description): |