You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2015/03/11 19:03:39 UTC
[1/2] ambari git commit: AMBARI-10032. HostCleanup.py failed to start
on Ubuntu (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/branch-2.0.0 d481b4d6f -> 42b9baadd
refs/heads/trunk 1b22d34e5 -> f81da87c0
AMBARI-10032. HostCleanup.py failed to start on Ubuntu (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f81da87c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f81da87c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f81da87c
Branch: refs/heads/trunk
Commit: f81da87c09788118df46ce907e0e6891003aa0b7
Parents: 1b22d34
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Wed Mar 11 20:03:23 2015 +0200
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Wed Mar 11 20:03:23 2015 +0200
----------------------------------------------------------------------
ambari-agent/src/main/python/ambari_agent/HostCleanup.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/f81da87c/ambari-agent/src/main/python/ambari_agent/HostCleanup.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/python/ambari_agent/HostCleanup.py b/ambari-agent/src/main/python/ambari_agent/HostCleanup.py
index ca9bc41..ca2bcf4 100644
--- a/ambari-agent/src/main/python/ambari_agent/HostCleanup.py
+++ b/ambari-agent/src/main/python/ambari_agent/HostCleanup.py
@@ -17,12 +17,12 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
'''
-import sys
-from ambari_commons.os_family_impl import OsFamilyImpl, OsFamilyFuncImpl
-
# For compatibility with different OSes
# Edit PYTHONPATH to be able to import common_functions
+import sys
sys.path.append("/usr/lib/python2.6/site-packages/")
+########################################################
+
import os
import string
import subprocess
@@ -37,7 +37,7 @@ import datetime
from AmbariConfig import AmbariConfig
from ambari_commons import OSCheck, OSConst
from ambari_commons.constants import AMBARI_SUDO_BINARY
-
+from ambari_commons.os_family_impl import OsFamilyImpl, OsFamilyFuncImpl
logger = logging.getLogger()
[2/2] ambari git commit: AMBARI-10032. HostCleanup.py failed to start
on Ubuntu (aonishuk)
Posted by ao...@apache.org.
AMBARI-10032. HostCleanup.py failed to start on Ubuntu (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/42b9baad
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/42b9baad
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/42b9baad
Branch: refs/heads/branch-2.0.0
Commit: 42b9baadd2015e5e836939a022e18b09cb2c55d6
Parents: d481b4d
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Wed Mar 11 20:03:25 2015 +0200
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Wed Mar 11 20:03:25 2015 +0200
----------------------------------------------------------------------
ambari-agent/src/main/python/ambari_agent/HostCleanup.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/42b9baad/ambari-agent/src/main/python/ambari_agent/HostCleanup.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/python/ambari_agent/HostCleanup.py b/ambari-agent/src/main/python/ambari_agent/HostCleanup.py
index ca9bc41..ca2bcf4 100644
--- a/ambari-agent/src/main/python/ambari_agent/HostCleanup.py
+++ b/ambari-agent/src/main/python/ambari_agent/HostCleanup.py
@@ -17,12 +17,12 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
'''
-import sys
-from ambari_commons.os_family_impl import OsFamilyImpl, OsFamilyFuncImpl
-
# For compatibility with different OSes
# Edit PYTHONPATH to be able to import common_functions
+import sys
sys.path.append("/usr/lib/python2.6/site-packages/")
+########################################################
+
import os
import string
import subprocess
@@ -37,7 +37,7 @@ import datetime
from AmbariConfig import AmbariConfig
from ambari_commons import OSCheck, OSConst
from ambari_commons.constants import AMBARI_SUDO_BINARY
-
+from ambari_commons.os_family_impl import OsFamilyImpl, OsFamilyFuncImpl
logger = logging.getLogger()