Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-04 17:33:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

systeminfo: add milestone in version

Browse Source 
tower:https://tower.im/projects/8162ac3745044ca29f9f3d21beaeb93d/todos/c63c0e4ea28248aeb97b8fc16d2ba87f/
Change-Id: I85f33f7e8505d8a9a1c6589c4af748f110e661fa
This commit is contained in:
jouyouyun 2015-06-29 14:50:35 +08:00
parent 364286950f
commit 74be404714
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
systeminfo/system_info.go
View File

@ -82,10 +82,13 @@ func getVersionFromDeepin(config string) (string, error) {
return "", err
}
t, err := kFile.GetLocaleString("Release", "Type", "\x00")
if err != nil {
return "", err
if err == nil {
version = version + " " + t
}
milestone, err := kFile.GetString("Addition", "Milestone")
if err == nil {
version = version + " " + milestone
}
version = version + " " + t
return version, nil
}
@ -225,10 +228,11 @@ func NewSystemInfo(l *log.Logger) *SystemInfo {
var err error
sys.Version, err = getVersionFromDeepin("/etc/deepin-version")
if err != nil {
sys.logger.Warning(err)
sys.logger.Debug(err)
sys.Version, err = getVersionFromLsb("/etc/lsb-release")
if err != nil {
sys.logger.Error(err)
sys.logger.Debug(err)
sys.Version = "Unkown"
return nil
}
}