merge from HEAD

diff --git a/build.functions b/build.functions
index 81f8889..c59e904 100644 (file)
--- a/build.functions
+++ b/build.functions
@@ -6,7 +6,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #

-# $Id: build.functions,v 1.10 2007/08/29 03:13:07 mef Exp $
+# $Id:$

 #
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
 #
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin

diff --git a/build.sh b/build.sh
index bbd08c3..eb01732 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -16,7 +16,7 @@
 # Marc E. Fiuczynski <mef@cs.princeton.edu>
 # Copyright (C) 2006-2007 The Trustees of Princeton University
 #
 # Marc E. Fiuczynski <mef@cs.princeton.edu>
 # Copyright (C) 2006-2007 The Trustees of Princeton University
 #

-# $Id: build.sh,v 1.41 2007/08/22 02:04:56 faiyaza Exp $
+# $Id:$

 #
 
 . build.functions
 #
 
 . build.functions

diff --git a/build_devel.sh b/build_devel.sh
index 1f2d782..4b8febb 100755 (executable)
--- a/build_devel.sh
+++ b/build_devel.sh
@@ -16,7 +16,7 @@
 # Marc E. Fiuczynski <mef@cs.princeton.edu>
 # Copyright (C) 2006-2007 The Trustees of Princeton University
 #
 # Marc E. Fiuczynski <mef@cs.princeton.edu>
 # Copyright (C) 2006-2007 The Trustees of Princeton University
 #

-# $Id: build_devel.sh,v 1.9.2.1 2007/08/30 16:39:06 mef Exp $
+# $Id:$

 #
 
 . build.functions
 #
 
 . build.functions


@@ -89,6 +89,6 @@ pl_fixtmp_permissions devel/data
 
 # Make image out of directory
 echo "* myplc-devel: Building loopback image"
 
 # Make image out of directory
 echo "* myplc-devel: Building loopback image"

-pl_make_mig devel/root devel/root.img 100000000
+pl_make_image devel/root devel/root.img 100000000

 
 exit 0
 
 exit 0

diff --git a/myplc-devel.spec b/myplc-devel.spec
index 4132490..78405ee 100644 (file)
--- a/myplc-devel.spec
+++ b/myplc-devel.spec
@@ -16,7 +16,7 @@ AutoReqProv: no
 %define debug_package %{nil}
 
 %description
 %define debug_package %{nil}
 
 %description

-This package install a complete PlanetLab development environment
+This package installs a complete PlanetLab development environment

 contained within a chroot jail. The default installation consists of
 all the tools necessary to compile MyPLC.
 
 contained within a chroot jail. The default installation consists of
 all the tools necessary to compile MyPLC.
 

diff --git a/plc_config.py b/plc_config.py
index 913ccfd..9bf3f8b 100644 (file)
--- a/plc_config.py
+++ b/plc_config.py
@@ -7,7 +7,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #

-# $Id: plc_config.py,v 1.3 2006/04/18 15:32:48 thierry Exp $
+# $Id: plc_config.py,v 1.5 2007/08/31 04:48:37 mef Exp $

 #
 
 import xml.dom.minidom
 #
 
 import xml.dom.minidom


@@ -798,6 +798,6 @@ class TrimTextElement(xml.dom.minidom.Element):
 
 if __name__ == '__main__':
     import sys
 
 if __name__ == '__main__':
     import sys

-    if len(sys.argv) > 1 and sys.argv[1] in ['build', 'install']:
+    if len(sys.argv) > 1 and sys.argv[1] in ['build', 'install', 'uninstall']:

         from distutils.core import setup
         setup(py_modules=["plc_config"])
         from distutils.core import setup
         setup(py_modules=["plc_config"])