summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornicolargo <nicolargo@nicolargo-boulot.(none)>2011-12-06 11:47:38 +0100
committernicolargo <nicolargo@nicolargo-boulot.(none)>2011-12-06 11:47:38 +0100
commit89a05958ccd20e3f9523f718862af638b04ba2f3 (patch)
treeac3e5e7079b3717d3fde91af88eccf995db13a8a
parent4f77c14a55882a3e3660acd3378b6b3fa1a5701d (diff)
version 1.1.3v1.1.3
-rw-r--r--README2
-rw-r--r--autom4te.cache/output.020
-rw-r--r--autom4te.cache/output.120
-rw-r--r--autom4te.cache/traces.12
-rwxr-xr-xconfigure20
-rw-r--r--configure.ac2
-rw-r--r--setup.py4
-rwxr-xr-xsrc/glances.py6
8 files changed, 38 insertions, 38 deletions
diff --git a/README b/README
index 696e7e01..c955be7b 100644
--- a/README
+++ b/README
@@ -3,7 +3,7 @@ Glances -- Eye on your system
## Description
-Glances is a CLI curses based monitoring tools for both GNU/Linux and BSD.
+Glances is a CLI curses based monitoring tool for both GNU/Linux and BSD.
Glances uses the libstatgrab library to get information from your system.
Glances is developed in Python and uses the python-statgrab lib.
diff --git a/autom4te.cache/output.0 b/autom4te.cache/output.0
index 3757b392..57193c7b 100644
--- a/autom4te.cache/output.0
+++ b/autom4te.cache/output.0
@@ -1,6 +1,6 @@
@%:@! /bin/sh
@%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.68 for Glances 1.1.2.
+@%:@ Generated by GNU Autoconf 2.68 for Glances 1.1.3.
@%:@
@%:@
@%:@ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='Glances'
PACKAGE_TARNAME='glances'
-PACKAGE_VERSION='1.1.2'
-PACKAGE_STRING='Glances 1.1.2'
+PACKAGE_VERSION='1.1.3'
+PACKAGE_STRING='Glances 1.1.3'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1185,7 +1185,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Glances 1.1.2 to adapt to many kinds of systems.
+\`configure' configures Glances 1.1.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1251,7 +1251,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Glances 1.1.2:";;
+ short | recursive ) echo "Configuration of Glances 1.1.3:";;
esac
cat <<\_ACEOF
@@ -1325,7 +1325,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Glances configure 1.1.2
+Glances configure 1.1.3
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1342,7 +1342,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Glances $as_me 1.1.2, which was
+It was created by Glances $as_me 1.1.3, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2163,7 +2163,7 @@ fi
# Define the identity of the package.
PACKAGE='glances'
- VERSION='1.1.2'
+ VERSION='1.1.3'
cat >>confdefs.h <<_ACEOF
@@ -2970,7 +2970,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Glances $as_me 1.1.2, which was
+This file was extended by Glances $as_me 1.1.3, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3032,7 +3032,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-Glances config.status 1.1.2
+Glances config.status 1.1.3
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/autom4te.cache/output.1 b/autom4te.cache/output.1
index 3757b392..57193c7b 100644
--- a/autom4te.cache/output.1
+++ b/autom4te.cache/output.1
@@ -1,6 +1,6 @@
@%:@! /bin/sh
@%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.68 for Glances 1.1.2.
+@%:@ Generated by GNU Autoconf 2.68 for Glances 1.1.3.
@%:@
@%:@
@%:@ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='Glances'
PACKAGE_TARNAME='glances'
-PACKAGE_VERSION='1.1.2'
-PACKAGE_STRING='Glances 1.1.2'
+PACKAGE_VERSION='1.1.3'
+PACKAGE_STRING='Glances 1.1.3'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1185,7 +1185,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Glances 1.1.2 to adapt to many kinds of systems.
+\`configure' configures Glances 1.1.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1251,7 +1251,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Glances 1.1.2:";;
+ short | recursive ) echo "Configuration of Glances 1.1.3:";;
esac
cat <<\_ACEOF
@@ -1325,7 +1325,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Glances configure 1.1.2
+Glances configure 1.1.3
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1342,7 +1342,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Glances $as_me 1.1.2, which was
+It was created by Glances $as_me 1.1.3, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2163,7 +2163,7 @@ fi
# Define the identity of the package.
PACKAGE='glances'
- VERSION='1.1.2'
+ VERSION='1.1.3'
cat >>confdefs.h <<_ACEOF
@@ -2970,7 +2970,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Glances $as_me 1.1.2, which was
+This file was extended by Glances $as_me 1.1.3, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3032,7 +3032,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-Glances config.status 1.1.2
+Glances config.status 1.1.3
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/autom4te.cache/traces.1 b/autom4te.cache/traces.1
index 9e388756..935c7fa3 100644
--- a/autom4te.cache/traces.1
+++ b/autom4te.cache/traces.1
@@ -1,4 +1,4 @@
-m4trace:configure.ac:4: -1- AC_INIT([Glances], [1.1.2], [], [glances])
+m4trace:configure.ac:4: -1- AC_INIT([Glances], [1.1.3], [], [glances])
m4trace:configure.ac:4: -1- m4_pattern_forbid([^_?A[CHUM]_])
m4trace:configure.ac:4: -1- m4_pattern_forbid([_AC_])
m4trace:configure.ac:4: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS'])
diff --git a/configure b/configure
index 43fc51e4..ce93b67d 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for Glances 1.1.2.
+# Generated by GNU Autoconf 2.68 for Glances 1.1.3.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='Glances'
PACKAGE_TARNAME='glances'
-PACKAGE_VERSION='1.1.2'
-PACKAGE_STRING='Glances 1.1.2'
+PACKAGE_VERSION='1.1.3'
+PACKAGE_STRING='Glances 1.1.3'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1185,7 +1185,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Glances 1.1.2 to adapt to many kinds of systems.
+\`configure' configures Glances 1.1.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1251,7 +1251,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Glances 1.1.2:";;
+ short | recursive ) echo "Configuration of Glances 1.1.3:";;
esac
cat <<\_ACEOF
@@ -1325,7 +1325,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Glances configure 1.1.2
+Glances configure 1.1.3
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1342,7 +1342,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Glances $as_me 1.1.2, which was
+It was created by Glances $as_me 1.1.3, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2163,7 +2163,7 @@ fi
# Define the identity of the package.
PACKAGE='glances'
- VERSION='1.1.2'
+ VERSION='1.1.3'
cat >>confdefs.h <<_ACEOF
@@ -2970,7 +2970,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Glances $as_me 1.1.2, which was
+This file was extended by Glances $as_me 1.1.3, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3032,7 +3032,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-Glances config.status 1.1.2
+Glances config.status 1.1.3
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 08ce1d5e..95232cb7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
dnl Created by Anjuta application wizard.
-AC_INIT(Glances, 1.1.2, , glances)
+AC_INIT(Glances, 1.1.3, , glances)
AC_CONFIG_HEADERS([config.h])
diff --git a/setup.py b/setup.py
index eb596616..dffdb511 100644
--- a/setup.py
+++ b/setup.py
@@ -11,8 +11,8 @@ def read(fname):
return open(os.path.join(os.path.dirname(__file__), fname)).read()
setup( name='Glances',
- version='1.1.2',
- description='CLI curses-based monitoring tools',
+ version='1.1.3',
+ description='CLI curses-based monitoring tool',
author='Nicolas Hennion',
author_email='nicolas@nicolargo.com',
license = "LGPL",
diff --git a/src/glances.py b/src/glances.py
index 7827d278..9165a9c9 100755
--- a/src/glances.py
+++ b/src/glances.py
@@ -33,7 +33,7 @@ import statgrab
#==================
# The glances version id
-__version__ = "1.1.2"
+__version__ = "1.1.3"
# Class
#======
@@ -359,8 +359,8 @@ class glancesScreen():
for interface in range(0, min(4, len(network))):
elapsed_time = max (1, network[interface]['systime'])
self.term_window.addnstr(self.network_y+1+interface, self.network_x, network[interface]['interface_name']+':', 8)
- self.term_window.addnstr(self.network_y+1+interface, self.network_x+10, str(network[interface]['rx']/elapsed_time/1000), 8)
- self.term_window.addnstr(self.network_y+1+interface, self.network_x+20, str(network[interface]['tx']/elapsed_time/1000), 8)
+ self.term_window.addnstr(self.network_y+1+interface, self.network_x+10, str(network[interface]['rx']/elapsed_time/1000*8), 8)
+ self.term_window.addnstr(self.network_y+1+interface, self.network_x+20, str(network[interface]['tx']/elapsed_time/1000*8), 8)
def displayDiskIO(self, diskio):