Merge branch 'master' of dhozac@git.planet-lab.org:/git/pyplnet

diff --git a/Makefile b/Makefile
new file mode 100644 (file)
index 0000000..74752da
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,4 @@
+tags:
+       etags *.py
+
+.PHONY: tags

diff --git a/modprobe.py b/modprobe.py
index 5e4053d..e13a658 100644 (file)
--- a/modprobe.py
+++ b/modprobe.py
@@ -1,7 +1,4 @@
 #
-# $Id$
-#
-
 """Modprobe is a utility to read/modify/write /etc/modprobe.conf"""
 
 import os

diff --git a/plnet.py b/plnet.py
index a99add8..76e1307 100755 (executable)
--- a/plnet.py
+++ b/plnet.py
@@ -1,5 +1,4 @@
 #!/usr/bin/python /usr/bin/plcsh
-# $Id$
 
 import os
 import socket
@@ -44,7 +43,7 @@ def InitInterfaces(logger, plc, data, root="", files_only=False, program="NodeMa
     failedToGetSettings = False
 
     # NOTE: GetInterfaces/NodeNetworks does not necessarily order the interfaces
-    # returned.  Because 'interface'is decremented as each interface is processed,
+    # returned.  Because 'interface' is decremented as each interface is processed,
     # by the time is_primary=True (primary) interface is reached, the device
     # "eth%s" % interface, is not eth0.  But, something like eth-4, or eth-12.
     # This code sorts the interfaces, placing is_primary=True interfaces first.  
@@ -268,7 +267,7 @@ def InitInterfaces(logger, plc, data, root="", files_only=False, program="NodeMa
         # print the configuration values
         for (key, val) in details.iteritems():
             if key not in ('IFNAME','ALIAS','CFGOPTIONS','DRIVER','GATEWAY'):
-                f.write('%s=%s\n' % (key, val))
+                f.write('%s="%s"\n' % (key, val))
 
         # print the configuration specific option values (if any)
         if 'CFGOPTIONS' in details:

diff --git a/pyplnet.spec b/pyplnet.spec
index ae23da8..b4f8d69 100644 (file)
--- a/pyplnet.spec
+++ b/pyplnet.spec
@@ -1,11 +1,6 @@
-#
-# $Id$
-#
-%define url $URL$
-
 %define name pyplnet
 %define version 4.3
-%define taglevel 6
+%define taglevel 8
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
@@ -23,7 +18,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Vendor: PlanetLab
 Packager: PlanetLab Central <support@planet-lab.org>
 Distribution: PlanetLab %{plrelease}
-URL: %(echo %{url} | cut -d ' ' -f 2)
+URL: %{SCMURL}
 
 Requires: python >= 2.4
 BuildRequires: python, python-devel
@@ -55,6 +50,12 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/*
 
 %changelog
+* Mon Jan 24 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - pyplnet-4.3-8
+- no semantic change - just fixed specfile for git URL
+
+* Thu Dec 09 2010 Daniel Hokka Zakrisson <dhokka@cs.princeton.edu> - pyplnet-4.3-7
+- Secondary interface fixes and features.
+
 * Wed Apr 28 2010 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - pyplnet-4.3-6
 - aliases don't show up in /sys, so use /sbin/ip to get the configured IP addresses instead
 

diff --git a/setup.py b/setup.py
index 5993ca4..859ec91 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -5,8 +5,6 @@
 # Daniel Hokka Zakrisson <daniel@hozac.com>
 # Copyright (C) 2008 The Trustees of Princeton University
 #
-# $Id$
-#
 
 import os
 from distutils.core import setup, Extension

diff --git a/sioc.py b/sioc.py
index b4e0b46..f887245 100644 (file)
--- a/sioc.py
+++ b/sioc.py
@@ -1,4 +1,3 @@
-# $Id$
 # vim:set ts=4 sw=4 expandtab:
 # (c) Copyright 2008 The Trustees of Princeton University