incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ey...@apache.org
Subject svn commit: r1185939 - in /incubator/ambari/trunk/agent/src: main/python/ambari_component/package.py main/python/setup.py packages/deb/hms-agent.control/control
Date Wed, 19 Oct 2011 01:12:34 GMT
Author: eyang
Date: Wed Oct 19 01:12:33 2011
New Revision: 1185939

URL: http://svn.apache.org/viewvc?rev=1185939&view=rev
Log:
AMBARI-71. Fix broken packaging and startup scripts. (Eric Yang)

Modified:
    incubator/ambari/trunk/agent/src/main/python/ambari_component/package.py
    incubator/ambari/trunk/agent/src/main/python/setup.py
    incubator/ambari/trunk/agent/src/packages/deb/hms-agent.control/control

Modified: incubator/ambari/trunk/agent/src/main/python/ambari_component/package.py
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/agent/src/main/python/ambari_component/package.py?rev=1185939&r1=1185938&r2=1185939&view=diff
==============================================================================
--- incubator/ambari/trunk/agent/src/main/python/ambari_component/package.py (original)
+++ incubator/ambari/trunk/agent/src/main/python/ambari_component/package.py Wed Oct 19 01:12:33
2011
@@ -56,7 +56,7 @@ class packageRunner:
                     test = self.rpmInstall(list)
                     if test['exit_code']!=0:
                         raise Exception(test['error'])
-                elif string.find(packageName, "yum:///")==0):
+                elif string.find(packageName, "yum:///")==0:
                     packageName = packageName[7:]
                     self.yumInstall(packageName, dryRun)
                 else:
@@ -74,9 +74,7 @@ class packageRunner:
         try:
             for package in packages:
                 packageName=package['name']
-                if string.find(packageName, ".tar.gz")>0 or string.find(package, ".tgz")>0:
-                    #self.tarballRemove(packageName, dryRun)
-                else:
+                if string.find(packageName, ".tar.gz")==-1 and string.find(package, ".tgz")==-1:
                     self.yumRemove(packageName, dryRun)
             result = {'exit_code': 0, 'output': 'Remove Successfully', 'error': ''}
         except Exception:

Modified: incubator/ambari/trunk/agent/src/main/python/setup.py
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/agent/src/main/python/setup.py?rev=1185939&r1=1185938&r2=1185939&view=diff
==============================================================================
--- incubator/ambari/trunk/agent/src/main/python/setup.py (original)
+++ incubator/ambari/trunk/agent/src/main/python/setup.py Wed Oct 19 01:12:33 2011
@@ -18,7 +18,7 @@ from setuptools import setup
 setup(
     name = "ambari-agent",
     version = "0.1.0",
-    packages = ['ambari_agent', 'ambari_torrent'],
+    packages = ['ambari_agent', 'ambari_torrent', 'ambari_component'],
     # metadata for upload to PyPI
     author = "Apache Software Foundation",
     author_email = "ambari-dev@incubator.apache.org",

Modified: incubator/ambari/trunk/agent/src/packages/deb/hms-agent.control/control
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/agent/src/packages/deb/hms-agent.control/control?rev=1185939&r1=1185938&r2=1185939&view=diff
==============================================================================
--- incubator/ambari/trunk/agent/src/packages/deb/hms-agent.control/control (original)
+++ incubator/ambari/trunk/agent/src/packages/deb/hms-agent.control/control Wed Oct 19 01:12:33
2011
@@ -12,7 +12,6 @@
 # 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.
-
 Package: hms-agent
 Version: @version@
 Section: misc



Mime
View raw message