check the license headers carefully for all files

diff --git a/mic/chroot.py b/mic/chroot.py
index 026ea7e..c3bcb4e 100644 (file)
--- a/mic/chroot.py
+++ b/mic/chroot.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python -tt
 #
-# Copyright 2008, 2009, 2010 Intel, Inc.
+# Copyright 2009, 2010, 2011 Intel, Inc.
 #
 # This copyrighted material is made available to anyone wishing to use, modify,
 # copy, or redistribute it subject to the terms and conditions of the GNU

diff --git a/mic/configmgr.py b/mic/configmgr.py
index 86cb21a..b1353d2 100644 (file)
--- a/mic/configmgr.py
+++ b/mic/configmgr.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python -tt
 #
-# Copyright 2008, 2009, 2010 Intel, Inc.
+# Copyright 2011 Intel, Inc.
 #
 # This copyrighted material is made available to anyone wishing to use, modify,
 # copy, or redistribute it subject to the terms and conditions of the GNU

diff --git a/mic/creator.py b/mic/creator.py
index e47fa57..ac55a4d 100644 (file)
--- a/mic/creator.py
+++ b/mic/creator.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python -tt
 #
-# Copyright 2008, 2009, 2010 Intel, Inc.
+# Copyright 2011 Intel, Inc.
 #
 # This copyrighted material is made available to anyone wishing to use, modify,
 # copy, or redistribute it subject to the terms and conditions of the GNU

diff --git a/mic/imager/fs.py b/mic/imager/fs.py
index 26ef629..fe0a52a 100644 (file)
--- a/mic/imager/fs.py
+++ b/mic/imager/fs.py
@@ -1,20 +1,21 @@
+#!/usr/bin/python -tt
 #
-# creator.py : ImageCreator and LoopImageCreator base classes
+# Copyright 2011 Intel, Inc.
 #
-# Copyright 2007, Red Hat  Inc.
+# This copyrighted material is made available to anyone wishing to use, modify,
+# copy, or redistribute it subject to the terms and conditions of the GNU
+# General Public License v.2.  This program is distributed in the hope that it
+# will be useful, but WITHOUT ANY WARRANTY expressed or implied, including the
+# implied warranties of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the GNU General Public License for more details.
 #
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc., 51
+# Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  Any Red Hat
+# trademarks that are incorporated in the source code or documentation are not
+# subject to the GNU General Public License and may only be used or replicated
+# with the express permission of Red Hat, Inc.
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Library General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 import os, sys
 import subprocess

diff --git a/mic/imager/livecd.py b/mic/imager/livecd.py
index eb95d72..d04b5a8 100644 (file)
--- a/mic/imager/livecd.py
+++ b/mic/imager/livecd.py
@@ -1,20 +1,21 @@
+#!/usr/bin/python -tt
 #
-# livecd.py : LiveCDImageCreator class for creating Live CD images
+# Copyright 2011 Intel, Inc.
 #
-# Copyright 2007, Red Hat  Inc.
+# This copyrighted material is made available to anyone wishing to use, modify,
+# copy, or redistribute it subject to the terms and conditions of the GNU
+# General Public License v.2.  This program is distributed in the hope that it
+# will be useful, but WITHOUT ANY WARRANTY expressed or implied, including the
+# implied warranties of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the GNU General Public License for more details.
 #
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc., 51
+# Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  Any Red Hat
+# trademarks that are incorporated in the source code or documentation are not
+# subject to the GNU General Public License and may only be used or replicated
+# with the express permission of Red Hat, Inc.
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Library General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 import os, sys
 import glob

diff --git a/mic/imager/liveusb.py b/mic/imager/liveusb.py
index 3f4a69a..33ea152 100644 (file)
--- a/mic/imager/liveusb.py
+++ b/mic/imager/liveusb.py
@@ -1,20 +1,21 @@
+#!/usr/bin/python -tt
 #
-# liveusb.py : LiveUSBImageCreator class for creating Live USB images
+# Copyright 2011 Intel, Inc.
 #
-# Copyright 2007, Red Hat  Inc.
+# This copyrighted material is made available to anyone wishing to use, modify,
+# copy, or redistribute it subject to the terms and conditions of the GNU
+# General Public License v.2.  This program is distributed in the hope that it
+# will be useful, but WITHOUT ANY WARRANTY expressed or implied, including the
+# implied warranties of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the GNU General Public License for more details.
 #
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc., 51
+# Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  Any Red Hat
+# trademarks that are incorporated in the source code or documentation are not
+# subject to the GNU General Public License and may only be used or replicated
+# with the express permission of Red Hat, Inc.
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Library General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 import os
 import shutil

diff --git a/mic/imager/loop.py b/mic/imager/loop.py
index 8ac1a4f..7c5a867 100644 (file)
--- a/mic/imager/loop.py
+++ b/mic/imager/loop.py
@@ -1,20 +1,21 @@
+#!/usr/bin/python -tt
 #
-# loop.py : LoopImageCreator classes
+# Copyright 2011 Intel, Inc.
 #
-# Copyright 2007, Red Hat  Inc.
+# This copyrighted material is made available to anyone wishing to use, modify,
+# copy, or redistribute it subject to the terms and conditions of the GNU
+# General Public License v.2.  This program is distributed in the hope that it
+# will be useful, but WITHOUT ANY WARRANTY expressed or implied, including the
+# implied warranties of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the GNU General Public License for more details.
 #
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc., 51
+# Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  Any Red Hat
+# trademarks that are incorporated in the source code or documentation are not
+# subject to the GNU General Public License and may only be used or replicated
+# with the express permission of Red Hat, Inc.
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Library General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 import os
 import subprocess

diff --git a/mic/imager/raw.py b/mic/imager/raw.py
index 2d74874..c8289d2 100644 (file)
--- a/mic/imager/raw.py
+++ b/mic/imager/raw.py
@@ -1,21 +1,21 @@
+#!/usr/bin/python -tt
 #
-# raw.py: RawImageCreator class
+# Copyright 2011 Intel, Inc.
 #
-# Copyright 2007-2008, Red Hat  Inc.
-# Copyright 2008, Daniel P. Berrange
+# This copyrighted material is made available to anyone wishing to use, modify,
+# copy, or redistribute it subject to the terms and conditions of the GNU
+# General Public License v.2.  This program is distributed in the hope that it
+# will be useful, but WITHOUT ANY WARRANTY expressed or implied, including the
+# implied warranties of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the GNU General Public License for more details.
 #
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc., 51
+# Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  Any Red Hat
+# trademarks that are incorporated in the source code or documentation are not
+# subject to the GNU General Public License and may only be used or replicated
+# with the express permission of Red Hat, Inc.
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Library General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 import os
 import stat

diff --git a/mic/msger.py b/mic/msger.py
index ea041a2..e9143ef 100644 (file)
--- a/mic/msger.py
+++ b/mic/msger.py
@@ -1,20 +1,22 @@
 #!/usr/bin/python -tt
 # vim: ai ts=4 sts=4 et sw=4
-
-#    Copyright (c) 2009 Intel Corporation
 #
-#    This program is free software; you can redistribute it and/or modify it
-#    under the terms of the GNU General Public License as published by the Free
-#    Software Foundation; version 2 of the License
+# Copyright 2009, 2010, 2011 Intel, Inc.
+#
+# This copyrighted material is made available to anyone wishing to use, modify,
+# copy, or redistribute it subject to the terms and conditions of the GNU
+# General Public License v.2.  This program is distributed in the hope that it
+# will be useful, but WITHOUT ANY WARRANTY expressed or implied, including the
+# implied warranties of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the GNU General Public License for more details.
 #
-#    This program is distributed in the hope that it will be useful, but
-#    WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-#    or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#    for more details.
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc., 51
+# Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  Any Red Hat
+# trademarks that are incorporated in the source code or documentation are not
+# subject to the GNU General Public License and may only be used or replicated
+# with the express permission of Red Hat, Inc.
 #
-#    You should have received a copy of the GNU General Public License along
-#    with this program; if not, write to the Free Software Foundation, Inc., 59
-#    Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 import os,sys
 import re

diff --git a/mic/pluginbase.py b/mic/pluginbase.py
index 1fdf390..33c9433 100644 (file)
--- a/mic/pluginbase.py
+++ b/mic/pluginbase.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python -tt
 #
-# Copyright 2008, 2009, 2010 Intel, Inc.
+# Copyright 2011 Intel, Inc.
 #
 # This copyrighted material is made available to anyone wishing to use, modify,
 # copy, or redistribute it subject to the terms and conditions of the GNU

diff --git a/mic/pluginmgr.py b/mic/pluginmgr.py
index 3569387..61997dc 100644 (file)
--- a/mic/pluginmgr.py
+++ b/mic/pluginmgr.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python -tt
 #
-# Copyright 2008, 2009, 2010 Intel, Inc.
+# Copyright 2011 Intel, Inc.
 #
 # This copyrighted material is made available to anyone wishing to use, modify,
 # copy, or redistribute it subject to the terms and conditions of the GNU

diff --git a/mic/utils/misc.py b/mic/utils/misc.py
index 322e5c4..5e0af7d 100644 (file)
--- a/mic/utils/misc.py
+++ b/mic/utils/misc.py
@@ -1,7 +1,7 @@
 #
 # misc.py : miscellaneous utilities
 #
-# Copyright 2010, Intel Inc.
+# Copyright 2010, 2011 Intel Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

diff --git a/mic/utils/rpmmisc.py b/mic/utils/rpmmisc.py
index 1b42aaf..e58bdfd 100644 (file)
--- a/mic/utils/rpmmisc.py
+++ b/mic/utils/rpmmisc.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python -tt
 #
-# Copyright 2008, 2009, 2010 Intel, Inc.
+# Copyright 2008, 2009, 2010, 2011 Intel, Inc.
 #
 # This copyrighted material is made available to anyone wishing to use, modify,
 # copy, or redistribute it subject to the terms and conditions of the GNU

diff --git a/plugins/imager/fs_plugin.py b/plugins/imager/fs_plugin.py
index 80cd985..236d31f 100644 (file)
--- a/plugins/imager/fs_plugin.py
+++ b/plugins/imager/fs_plugin.py
@@ -33,10 +33,13 @@ class FsPlugin(ImagerPlugin):
         createopts = cfgmgr.create
         cfgmgr.setProperty("ksconf", ksconf)
 
+        # try to find the pkgmgr
+        pkgmgr = None
         plgmgr = pluginmgr.PluginMgr()
         for (key, pcls) in plgmgr.get_plugins('backend').iteritems():
             if key == createopts['pkgmgr']:
                 pkgmgr = pcls
+                break
 
         if not pkgmgr:
             raise CreatorError("Can't find backend plugin: %s" % createopts['pkgmgr'])

diff --git a/plugins/imager/livecd_plugin.py b/plugins/imager/livecd_plugin.py
index a0bccca..139476d 100644 (file)
--- a/plugins/imager/livecd_plugin.py
+++ b/plugins/imager/livecd_plugin.py
@@ -35,11 +35,14 @@ class LiveCDPlugin(ImagerPlugin):
         cfgmgr = configmgr.getConfigMgr()
         cfgmgr.setProperty("ksconf", ksconf)
         creatoropts = cfgmgr.create
-        plgmgr = pluginmgr.PluginMgr()
 
+        # try to find the pkgmgr
+        pkgmgr = None
+        plgmgr = pluginmgr.PluginMgr()
         for (key, pcls) in plgmgr.get_plugins('backend').iteritems():
-            if key == creatoropts['pkgmgr']:
+            if key == createopts['pkgmgr']:
                 pkgmgr = pcls
+                break
 
         if not pkgmgr:
             raise CreatorError("Can't find backend %s" % pkgmgr)

diff --git a/plugins/imager/liveusb_plugin.py b/plugins/imager/liveusb_plugin.py
index e4dc98b..2720434 100644 (file)
--- a/plugins/imager/liveusb_plugin.py
+++ b/plugins/imager/liveusb_plugin.py
@@ -38,11 +38,14 @@ class LiveUSBPlugin(ImagerPlugin):
         cfgmgr = configmgr.getConfigMgr()
         creatoropts = cfgmgr.create
         cfgmgr.setProperty("ksconf", args[0])
-        plgmgr = pluginmgr.PluginMgr()
 
+        # try to find the pkgmgr
+        pkgmgr = None
+        plgmgr = pluginmgr.PluginMgr()
         for (key, pcls) in plgmgr.get_plugins('backend').iteritems():
-            if key == creatoropts['pkgmgr']:
+            if key == createopts['pkgmgr']:
                 pkgmgr = pcls
+                break
 
         creator = liveusb.LiveUSBImageCreator(creatoropts, pkgmgr)
         try:

diff --git a/plugins/imager/loop_plugin.py b/plugins/imager/loop_plugin.py
index b002e1a..b571922 100644 (file)
--- a/plugins/imager/loop_plugin.py
+++ b/plugins/imager/loop_plugin.py
@@ -37,11 +37,13 @@ class LoopPlugin(ImagerPlugin):
         creatoropts = cfgmgr.create
         cfgmgr.setProperty("ksconf", ksconf)
 
+        # try to find the pkgmgr
+        pkgmgr = None
         plgmgr = pluginmgr.PluginMgr()
-
         for (key, pcls) in plgmgr.get_plugins('backend').iteritems():
-            if key == creatoropts['pkgmgr']:
+            if key == createopts['pkgmgr']:
                 pkgmgr = pcls
+                break
 
         if not pkgmgr:
             raise CreatorError("Can't find backend %s" % pkgmgr)

diff --git a/plugins/imager/raw_plugin.py b/plugins/imager/raw_plugin.py
index 6a5659a..324d12a 100644 (file)
--- a/plugins/imager/raw_plugin.py
+++ b/plugins/imager/raw_plugin.py
@@ -37,11 +37,14 @@ class RawPlugin(ImagerPlugin):
         cfgmgr = configmgr.getConfigMgr()
         creatoropts = cfgmgr.create
         cfgmgr.setProperty("ksconf", ksconf)
-        plgmgr = pluginmgr.PluginMgr()
 
+        # try to find the pkgmgr
+        pkgmgr = None
+        plgmgr = pluginmgr.PluginMgr()
         for (key, pcls) in plgmgr.get_plugins('backend').iteritems():
-            if key == creatoropts['pkgmgr']:
+            if key == createopts['pkgmgr']:
                 pkgmgr = pcls
+                break
 
         if not pkgmgr:
             raise CreatorError("Can't find backend %s" % pkgmgr)