[prev in list] [next in list] [prev in thread] [next in thread] 

List:       moblin-commits
Subject:    [Moblin-Commits] moblin-image-creator: Changes to 'master'
From:       prajwal () moblin ! org (Prajwal Karur Mohan)
Date:       2008-02-28 10:43:44
Message-ID: 20080228184342.B2E5B92C022 () moblin ! org
[Download RAW message or body]

 debian/changelog         |    6 ++++--
 gui/project_assistant.py |   21 +++++++++++++++++----
 image-creator            |    4 ++++
 3 files changed, 25 insertions(+), 6 deletions(-)

New commits:
commit 03278c52e67a1c8f8f8242bc7904d3e5ee1010d3
Author: Prajwal Mohan <prajwal@linux.intel.com>
Date:   Thu Feb 28 10:40:55 2008 -0800

    * Simpler check for version in project assistant
    * Fixing bug 182161. Target name was not being checked for non alpha numeric
      chars in project assistant and cmd line


Diff in this email is a maximum of 400 lines.
diff --git a/debian/changelog b/debian/changelog
index 588608b..c5dd791 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -37,9 +37,11 @@ moblin-image-creator (0.41) UNRELEASED; urgency=low
   [ Prajwal Mohan ]
   * Checking for pygtk version before setting tooltip. Tooltip is supported in
     PyGTK 2.12 and above
-  * Simpler check for version in project assistant 
+  * Simpler check for version in project assistant
+  * Fixing bug 182161. Target name was not being checked for non alpha numeric
+    chars in project assistant and cmd line 
 
- -- John L. Villalovos <john.l.villalovos@intel.com>  Tue, 26 Feb 2008 14:57:03 \
-0800 + -- Prajwal Mohan <prajwal@linux.intel.com>  Thu, 28 Feb 2008 10:39:53 -0800
 
 moblin-image-creator (0.40) gaston; urgency=low
 
diff --git a/gui/project_assistant.py b/gui/project_assistant.py
index e665e99..d61a631 100644
--- a/gui/project_assistant.py
+++ b/gui/project_assistant.py
@@ -302,9 +302,17 @@ class projectAssistant(object):
         """Creates the GUI elements for target page of the assistant"""
         targetNameLabel = gtk.Label("Target Name")
         self.targetNameEntry = gtk.Entry()
-        targetName = gtk.HBox()
-        targetName.pack_start(targetNameLabel, False, False, 10)
-        targetName.pack_start(self.targetNameEntry, True, True, 10)
+        targetNameHbox = gtk.HBox()
+        targetNameHbox.pack_start(targetNameLabel, False, False, 10)
+        targetNameHbox.pack_start(self.targetNameEntry, True, True, 10)
+
+        self.targetWarning = gtk.Label()
+
+        targetName = gtk.VBox()
+        targetName.pack_start(targetNameHbox, False, False, 10)
+        targetName.pack_start(self.targetWarning, False, False, 10)
+
+
 
         self.targetNameEntry.connect("changed", self.target_entry_callback)
 
@@ -414,7 +422,12 @@ class projectAssistant(object):
         if not self.targetNameEntry.get_text():
             self.assistantDialog.set_page_complete(self.targetPage, False)
         else:
-            self.assistantDialog.set_page_complete(self.targetPage, True)
+            if re.search(r'\W', self.targetNameEntry.get_text()):
+                self.targetWarning.set_text("Target names can only contain \
alpha/numeric characters") +                \
self.assistantDialog.set_page_complete(self.targetPage, False) +            else:
+                self.targetWarning.set_text("")
+                self.assistantDialog.set_page_complete(self.targetPage, True)
             
 
     def display_configuration(self):
diff --git a/image-creator b/image-creator
index 2519f9c..fca5573 100755
--- a/image-creator
+++ b/image-creator
@@ -21,6 +21,7 @@ import os
 import platform
 import string
 import sys
+import re
 import traceback
 
 from optparse import OptionParser
@@ -469,6 +470,9 @@ def create_target(options):
     if not options.project_name in sdk.projects:
         print >> sys.stderr, "Project %s does not exist" % (options.project_name)
         sys.exit(1)
+    if re.search(r'\W', options.target_name):
+        print >> sys.stderr, "Target names can only contain alpha/numeric \
characters" +        sys.exit(1)
     target = sdk.projects[options.project_name].create_target(options.target_name, \
options.use_rootstrap)  
 def delete_target(options):


[prev in list] [next in list] [prev in thread] [next in thread]