This email list is read-only.  Emails sent to this list will be discarded
----------------------------------
 debian/changelog |    5 +++--
 libs/fsets.py    |    4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 4f844a729fd3b27e724953c0678d0d4af9dcc065
Author: Prajwal Mohan <[EMAIL PROTECTED]>
Date:   Sun Aug 17 11:01:53 2008 -0700

    Adding conflicts to fsets


Diff in this email is a maximum of 400 lines.
diff --git a/debian/changelog b/debian/changelog
index d193862..3c89e5f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -103,9 +103,10 @@ moblin-image-creator (0.45) UNRELEASED; urgency=low
 
   [ Prajwal Mohan ]
   * Adding nand to command line
-  * Adding repo editor and changes to gui 
+  * Adding repo editor and changes to gui
+  * Adding conflicts to fsets 
 
- -- Prajwal Mohan <[EMAIL PROTECTED]>  Sun, 17 Aug 2008 10:56:19 -0700
+ -- Prajwal Mohan <[EMAIL PROTECTED]>  Sun, 17 Aug 2008 11:01:31 -0700
 
 moblin-image-creator (0.44) gaston; urgency=low
 
diff --git a/libs/fsets.py b/libs/fsets.py
index 366943a..c86e93d 100755
--- a/libs/fsets.py
+++ b/libs/fsets.py
@@ -45,7 +45,7 @@ class FSet(object):
 
     def __parseFile(self, filename):
         valid_values = { 'desc' : '', 'pkgs' : [], 'debug_pkgs' : [],
-            'deps' : [] }
+            'deps' : [],  'conflicts' : [] }
         if not os.path.isfile(filename):
             return False
         p = ConfigParser.ConfigParser()
@@ -78,7 +78,7 @@ class FSet(object):
         return "FSet()"
 
 class FsetInstance(object):
-    valid_values = { 'desc' : '', 'pkgs' : [], 'debug_pkgs' : [], 'deps' : [] }
+    valid_values = { 'desc' : '', 'pkgs' : [], 'debug_pkgs' : [], 'deps' : [], 
'conflicts' : [] }
     def __init__(self, name):
         self.name = name.lower()
         self.data = {}
_______________________________________________
Commits mailing list
[email protected]
https://www.moblin.org/mailman/listinfo/commits

Reply via email to