Merge lp:~arvindsraj-deactivatedaccount/rhythmbox-ubuntuone/hardcoding-version-removed into lp:rhythmbox-ubuntuone

[Arvind S Raj]

Added a function that reads the codename of the present release from /etc/lsb-release and stores it in a variable CODENAME that can be used elsewhere.

[dobey (dobey)]

Hi Arvind. Thanks for the work on this. Sorry for the slow review. As you've probably heard, for 11.04 we are switching to banshee as the default player in Ubuntu. As a result, I have been working on making the u1ms extension for banshee be on par with the rhythmbox extension. Part of that work means supporting installing the mp3 plug-in for gstreamer from within banshee as well. With that in mind, we need to move this functionality to libubuntuone, which is in C; so I am going to reject this branch, based on that. Once the codec installation is supported in libubuntuone, we'll want to fix the banshee and rhythmbox extensions both to use that API instead of trying to do all this work on their own. Thanks again, and sorry for having to reject this. :)

review: Disapprove

Unmerged revisions

101. By Arvind S Raj on 2011-02-22

Eliminated hardcoding of Ubuntu codename: LP:#693536

=== modified file 'umusicstore/MusicStoreWidget.py'
--- umusicstore/MusicStoreWidget.py	2010-12-16 14:40:36 +0000
+++ umusicstore/MusicStoreWidget.py	2011-02-22 12:43:08 +0000
@@ -56,10 +56,20 @@
 MUSIC_STORE_WIDGET = U1MusicStore()  # keep this around for later
 U1LIBRARYPATH = MUSIC_STORE_WIDGET.get_library_location()
 RB_LIBRARY_LOCATIONS = "/apps/rhythmbox/library_locations"
-PARTNER_LIST = "canonical-partner-maverick.list"
+CODENAME = get_codename()
+PARTNER_LIST = "canonical-partner-" + CODENAME + ".list"
 SOURCES_DIR = "/etc/apt/sources.list.d/"
 PLUGIN_PACKAGENAME = "gstreamer0.10-fluendo-plugins-mp3-partner"
 
+def get_codename():
+    lsb_release_file=file("/etc/lsb-release", "r")
+    content = lsb_release_file.readlines()
+    lsb_release_file.close()
+    for line in content:
+        field = line.split('=')
+        if field[0] == 'DISTRIB_CODENAME':
+            return field[1]
+
 
 class U1EntryType(rhythmdb.EntryType):
     """Entry type for the Ubuntu One Music Store source."""
@@ -436,7 +446,7 @@
             trans = yield self.ac.add_repository(
                 src_type="deb",
                 uri="http://archive.canonical.com/",
-                dist="maverick",
+                dist=CODENAME,
                 comps=["partner"],
                 comment="added by U1MusicStoreWidget",
                 sourcesfile=PARTNER_LIST)