Update-manager talks about "Ubuntu 7.0"

Projet:Trisquel
Version:7.0
Composant:Programs
Catégorie:Rapporter un bogue
Priorité:normal
Attribué:Non assigné
Statut:active
Description

When
starting update-manager for the first time, it says that updates have
been released since "Ubuntu 7.0" was released. This stems from two
functions in UpdateManager.Core.utils which were not unbranded
correctly. The package helper would have to do something along the lines
of this (ignore the underlining) (I have not tested it too much yet):

--- utils.py	2014-10-15 00:42:22.077175000 -0700
+++ utils.py.new	2014-10-15 00:43:26.555175000 -0700
@@ -423,10 +423,10 @@
 
 def get_ubuntu_flavor_package(cache=None):
     """ try to guess the flavor metapackage based on the running desktop"""
-    # From spec, first if ubuntu-desktop is installed, use that.
+    # From spec, first if trisquel is installed, use that.
     # Second, grab first installed one from DistUpgrade.cfg.
-    # Lastly, fallback to ubuntu-desktop again.
-    meta_pkgs = ['ubuntu-desktop']
+    # Lastly, fallback to trisquel again.
+    meta_pkgs = ['trisquel']
 
     try:
         meta_pkgs.extend(sorted(_load_meta_pkg_list()))
@@ -439,19 +439,19 @@
         cache_pkg = cache[meta_pkg] if meta_pkg in cache else None
         if cache_pkg and cache_pkg.is_installed:
             return meta_pkg
-    return 'ubuntu-desktop'
+    return 'trisquel'
 
 
 def get_ubuntu_flavor_name(cache=None):
     """ try to guess the flavor name based on the running desktop """
     pkg = get_ubuntu_flavor_package(cache=cache)
-    lookup = {'ubuntustudio-desktop': 'Trisquel Studio'}
+    lookup = {}
     if pkg in lookup:
         return lookup[pkg]
-    elif pkg.endswith('-desktop'):
-        return capitalize_first_word(pkg.rsplit('-desktop', 1)[0])
-    elif pkg.endswith('-netbook'):
-        return capitalize_first_word(pkg.rsplit('-netbook', 1)[0])
+    elif pkg.endswith('-mini'):
+        return capitalize_first_word(pkg.rsplit('-mini', 1)[0])
+    elif pkg.endswith('-sugar'):
+        return capitalize_first_word(pkg.rsplit('-sugar', 1)[0])
     else:
         return 'Trisquel'
lun, 01/12/2015 - 22:55
Statut:duplicate» active
mar, 06/23/2015 - 15:01
Statut:active» fixed
mar, 06/23/2015 - 15:01
Statut:fixed» active