From 583368d3b12c4a8bb713ddaa1a9e7db63fe13cf5 Mon Sep 17 00:00:00 2001 From: Aminzai Date: Thu, 26 May 2011 11:41:02 +0800 Subject: [PATCH 1/2] add constant --- lazyscripts/constant.py | 36 ++++++++++++++++++++++++++++++++++++ lazyscripts/distro.py | 25 ++++++++++++++----------- 2 files changed, 50 insertions(+), 11 deletions(-) create mode 100644 lazyscripts/constant.py diff --git a/lazyscripts/constant.py b/lazyscripts/constant.py new file mode 100644 index 0000000..b2cddb8 --- /dev/null +++ b/lazyscripts/constant.py @@ -0,0 +1,36 @@ + +##Python +PYTHON_VERSION = '2.6.0' + +### DISTRIBUTION +# Debian base +DISTRIBUTION_DEBIAN = 'debian' +DISTRIBUTION_UBUNTU = 'ubuntu' +DISTRIBUTION_LINUXMINT = 'linuxmint' + +DISTRIBUTION_DEB_BASE = \ + (DISTRIBUTION_DEBIAN, + DISTRIBUTION_UBUNTU, + DISTRIBUTION_LINUXMINT) + + +# RPM Base +DISTRIBUTION_REDHAT = 'redhat' +DISTRIBUTION_CENTOS = 'centos' +DISTRIBUTION_FEDORA = 'fedora' + +DISTRIBUTION_SUSE = 'suse' +DISTRIBUTION_OPENSUSE = 'opensuse' +DISTRIBUTION_MANDRIVA = 'mandriva' + +DISTRIBUTION_RPM_BASE = \ + (DISTRIBUTION_REDHAT, + DISTRIBUTION_CENTOS, + DISTRIBUTION_FEDORA, + DISTRIBUTION_SUSE, + DISTRIBUTION_OPENSUSE, + DISTRIBUTION_MANDRIVA) + +### Architecture +ARCHITECTURE_I386 = 'i386' +ARCHITECTURE_AMD64 = 'amd64' diff --git a/lazyscripts/distro.py b/lazyscripts/distro.py index 9aaef4c..12974a1 100755 --- a/lazyscripts/distro.py +++ b/lazyscripts/distro.py @@ -21,6 +21,7 @@ import platform from lazyscripts import pkgmgr +from lazyscripts.constant import * class DistrobutionNotFound(Exception): "The distrobution can not be detected." @@ -45,7 +46,7 @@ def __repr__(self): def __init__(self): # linux_distribution is insted of dist # Ref: http://docs.python.org/library/platform.html - if platform.python_version() < '2.6.0': + if platform.python_version() < PYTHON_VERSION: (self.name, self.version, self.codename) = platform.dist() else: (self.name, self.version, self.codename) = platform.linux_distribution() @@ -63,9 +64,11 @@ def pkgsrc_name(self): @return str """ - if self.name in ('ubuntu', 'debian', 'linuxmint'): + #if self.name in ('ubuntu', 'debian', 'linuxmint'): + if self.name in DISTRIBUTION_DEB_BASE: extend = 'list' - elif self.name in ('fedora', 'redhat', 'centos','opensuse','suse','mandriva'): + #elif self.name in ('fedora', 'redhat', 'centos','opensuse','suse','mandriva'): + elif self.name in DISTRIBUTION_RPM_BASE: extend = 'sh' return "lzs_%s_%s_%s.%s" % (platform.machine(), self.name, @@ -93,32 +96,32 @@ def _reduce_name(self): raise DistrobutionNotFound() elif self.name == 'susE': if commands.getoutput('cat /etc/SuSE-release | grep "openSUSE"'): - self.name = 'opensuse' - elif self.name == 'redhat': + self.name = DISTRIBUTION_OPENSUSE + elif self.name == DISTRIBUTION_REDHAT: if commands.getoutput('cat /etc/redhat-release | grep "Red Hat"'): - self.name = 'redhat' + self.name = DISTRIBUTION_REDHAT if commands.getoutput('cat /etc/redhat-release | grep "CentOS"'): - self.name = 'centos' + self.name = DISTRIBUTION_CENTOS elif self.name in ('mandrake', 'mandriva linux'): if os.path.exists('/etc/mandriva-release') and \ commands.getoutput('cat /etc/mandriva-release | grep "Mandriva"'): - self.name = 'mandriva' + self.name = DISTRIBUTION_MANDRIVA #}}} #{{{def _reduce_version(self): def _reduce_version(self): if self.name == 'opensolaris' and not self.version: self.version = commands.getoutput('cat /etc/release | grep "OpenSolaris" | cut -d " " -f 27') - elif self.name == 'debian': + elif self.name == DISTRIBUTION_DEBIAN: self.version = self.version.split('.')[0] #}}} def _reduce_architecture(self): arch = platform.architecture()[0] if arch == '32bit': - self.architecture = 'i386' + self.architecture = ARCHITECTURE_I386 elif arch == '64bit': - self.architecture = 'amd64' + self.architecture = ARCHITECTURE_AMD64 else: self.architecture = None From 6bc080181ac99e867824a2c43dd9ddf9108d8541 Mon Sep 17 00:00:00 2001 From: Aminzai Date: Thu, 26 May 2011 12:03:30 +0800 Subject: [PATCH 2/2] fix constant name length --- lazyscripts/constant.py | 57 ++++++++++++++++++++++++----------------- lazyscripts/distro.py | 22 ++++++++-------- 2 files changed, 43 insertions(+), 36 deletions(-) diff --git a/lazyscripts/constant.py b/lazyscripts/constant.py index b2cddb8..7f57f02 100644 --- a/lazyscripts/constant.py +++ b/lazyscripts/constant.py @@ -4,33 +4,42 @@ ### DISTRIBUTION # Debian base -DISTRIBUTION_DEBIAN = 'debian' -DISTRIBUTION_UBUNTU = 'ubuntu' -DISTRIBUTION_LINUXMINT = 'linuxmint' +DIST_DEBIAN = 'debian' +DIST_UBUNTU = 'ubuntu' +DIST_LINUXMINT = 'linuxmint' -DISTRIBUTION_DEB_BASE = \ - (DISTRIBUTION_DEBIAN, - DISTRIBUTION_UBUNTU, - DISTRIBUTION_LINUXMINT) +DIST_DEB_BASE = \ + (DIST_DEBIAN, + DIST_UBUNTU, + DIST_LINUXMINT) # RPM Base -DISTRIBUTION_REDHAT = 'redhat' -DISTRIBUTION_CENTOS = 'centos' -DISTRIBUTION_FEDORA = 'fedora' - -DISTRIBUTION_SUSE = 'suse' -DISTRIBUTION_OPENSUSE = 'opensuse' -DISTRIBUTION_MANDRIVA = 'mandriva' - -DISTRIBUTION_RPM_BASE = \ - (DISTRIBUTION_REDHAT, - DISTRIBUTION_CENTOS, - DISTRIBUTION_FEDORA, - DISTRIBUTION_SUSE, - DISTRIBUTION_OPENSUSE, - DISTRIBUTION_MANDRIVA) +DIST_REDHAT = 'redhat' +DIST_CENTOS = 'centos' +DIST_FEDORA = 'fedora' + +DIST_SUSE = 'suse' +DIST_OPENSUSE = 'opensuse' +DIST_MANDRIVA = 'mandriva' + +DIST_RPM_BASE = \ + (DIST_REDHAT, + DIST_CENTOS, + DIST_FEDORA, + DIST_SUSE, + DIST_OPENSUSE, + DIST_MANDRIVA) + +# BSD Base +DIST_MACOSX = 'macosx' ### Architecture -ARCHITECTURE_I386 = 'i386' -ARCHITECTURE_AMD64 = 'amd64' +ARCH_I386 = 'i386' +ARCH_AMD64 = 'amd64' + +### System +SYSTEM_LINUX = 'Linux' +SYSTEM_MAC = 'Darwin' +# not ready +#SYSTEM_BSD = '' diff --git a/lazyscripts/distro.py b/lazyscripts/distro.py index 12974a1..4dd63db 100755 --- a/lazyscripts/distro.py +++ b/lazyscripts/distro.py @@ -64,11 +64,9 @@ def pkgsrc_name(self): @return str """ - #if self.name in ('ubuntu', 'debian', 'linuxmint'): - if self.name in DISTRIBUTION_DEB_BASE: + if self.name in DIST_DEB_BASE: extend = 'list' - #elif self.name in ('fedora', 'redhat', 'centos','opensuse','suse','mandriva'): - elif self.name in DISTRIBUTION_RPM_BASE: + elif self.name in DIST_RPM_BASE: extend = 'sh' return "lzs_%s_%s_%s.%s" % (platform.machine(), self.name, @@ -96,32 +94,32 @@ def _reduce_name(self): raise DistrobutionNotFound() elif self.name == 'susE': if commands.getoutput('cat /etc/SuSE-release | grep "openSUSE"'): - self.name = DISTRIBUTION_OPENSUSE - elif self.name == DISTRIBUTION_REDHAT: + self.name = DIST_OPENSUSE + elif self.name == DIST_REDHAT: if commands.getoutput('cat /etc/redhat-release | grep "Red Hat"'): - self.name = DISTRIBUTION_REDHAT + self.name = DIST_REDHAT if commands.getoutput('cat /etc/redhat-release | grep "CentOS"'): - self.name = DISTRIBUTION_CENTOS + self.name = DIST_CENTOS elif self.name in ('mandrake', 'mandriva linux'): if os.path.exists('/etc/mandriva-release') and \ commands.getoutput('cat /etc/mandriva-release | grep "Mandriva"'): - self.name = DISTRIBUTION_MANDRIVA + self.name = DIST_MANDRIVA #}}} #{{{def _reduce_version(self): def _reduce_version(self): if self.name == 'opensolaris' and not self.version: self.version = commands.getoutput('cat /etc/release | grep "OpenSolaris" | cut -d " " -f 27') - elif self.name == DISTRIBUTION_DEBIAN: + elif self.name == DIST_DEBIAN: self.version = self.version.split('.')[0] #}}} def _reduce_architecture(self): arch = platform.architecture()[0] if arch == '32bit': - self.architecture = ARCHITECTURE_I386 + self.architecture = ARCH_I386 elif arch == '64bit': - self.architecture = ARCHITECTURE_AMD64 + self.architecture = ARCH_AMD64 else: self.architecture = None