Changeset 7174


Ignore:
Timestamp:
Apr 25, 2018, 10:37:13 AM (19 months ago)
Author:
mabarracus
Message:

Fix striped version number

Location:
lliurex-statistics/trunk/fuentes
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • lliurex-statistics/trunk/fuentes/debian/changelog

    r7167 r7174  
     1lliurex-statistics (0.5.5) xenial; urgency=medium
     2
     3  * Fix striped version number
     4
     5 -- M.Angel Juan <m.angel.juan@gmail.com>  Wed, 25 Apr 2018 10:28:08 +0200
     6
    17lliurex-statistics (0.5.4) xenial; urgency=medium
    28
  • lliurex-statistics/trunk/fuentes/lliurex-statistics.install/usr/sbin/analytics

    r7167 r7174  
    232232    else:
    233233        output = bin_to_ascii(subprocess.check_output(['bash','lliurex-version','-n']))
     234    full_release = output.strip()
    234235    release = output[0:2].strip()
    235236    if release == '15':
     
    244245    flavour = output.strip()
    245246    #log.info("Detected release:'{}' flavour:'{}'".format(release, flavour))
    246     return release, flavour
     247    return release, flavour, full_release
    247248
    248249
     
    728729    subtype = { 'LTSP': None , 'MODE': None}
    729730    try:
    730         rel,fla = get_llx_version()
     731        rel,fla,full_rel = get_llx_version()
    731732        if rel == '15':
    732733            outtype = bin_to_ascii(subprocess.check_output(['lliurex-detect -a -e'],shell=True)).strip()
     
    998999
    9991000    try:
    1000         release, flavour = get_llx_version()
     1001        release, flavour, full_release = get_llx_version()
    10011002    except Exception as e:
    10021003        log.error('Error getting llx version {}'.format(e))
    10031004        release = 'Unknown'
    10041005        flavour = 'Unknown'
     1006        full_release = 'Unknown'
    10051007
    10061008    proxy = ''
     
    10171019
    10181020    if DAEMON_MODE:
    1019         daemonize(daemon_mode=True,flavour=flavour,release=release,proxy=proxy)
     1021        daemonize(daemon_mode=True,flavour=flavour,release=full_release,proxy=proxy)
    10201022    else:
    1021         start(daemon_mode=False,flavour=flavour,release=release,proxy=proxy)
     1023        start(daemon_mode=False,flavour=flavour,release=full_release,proxy=proxy)
    10221024
    10231025    log.debug('End main')
Note: See TracChangeset for help on using the changeset viewer.