Changeset 3697 for lliurex-base-files

Timestamp:

Feb 24, 2017, 10:17:26 AM (3 years ago)

Author:

mabarracus

Message:

Update lliurex-version to lliurex-detect 1.2

Location:

lliurex-base-files/trunk/fuentes

Files:

• debian/changelog (modified) (1 diff)
• install/usr/bin/lliurex-version (modified) (3 diffs)

lliurex-base-files/trunk/fuentes/debian/changelog

@@ +1 @@
+lliurex-base-files (16.06.11) xenial; urgency=medium
+
+  * Update lliurex-version to lliurex-detect 1.2
+
+ -- M.Angel Juan <m.angel.juan@gmail.com>  Fri, 24 Feb 2017 10:16:47 +0100
+
 lliurex-base-files (16.06.10) xenial; urgency=high
 

lliurex-base-files/trunk/fuentes/install/usr/bin/lliurex-version

@@ -85 +85 @@
                         cdd_content.extend(cdd)
                 except Exception as e:
-                    raise Exception('cddflavour file error '+str(e))
+                    cdd_content.append('None')
+                    #raise Exception('cddflavour file error '+str(e))
         else:
             for root,dirnames,filenames in os.walk('/usr/share/lliurex-cdd'):
@@ -97 +98 @@
                             cdd_content.extend(cdd)
                     except Exception as e:
-                        raise Exception('cddversion file error '+str(e))
+                        cdd_content.append('None')
+                        #raise Exception('cddversion file error '+str(e))
             else:
-                raise Exception('cddflavour or cddversion file not found! ')
+                #raise Exception('cddflavour or cddversion file not found! ')
+                cdd_content.append('None')
         cdd_content=list(set(cdd_content))
         cdd_content.sort()
@@ -112 +115 @@
     except Exception as e1:
         try:
-            with open('/usr/share/lliurex-cdd/version','r') as cdd_num_file:
+            with open('/uusr/share/lliurex-cdd/version','r') as cdd_num_file:
                 return cdd_num_file.readline().strip()
         except Exception as e2:
-            raise Exception('Error1: '+e1+' and Error2: '+e2)
+            return '0'
+            #raise Exception('Error1: '+e1+' and Error2: '+e2)
 #def detect_num_cdd():