This email list is read-only. Emails sent to this list will be discarded
----------------------------------
debian/changelog | 3 ++-
libs/InstallImage.py | 34 +++++++++++++++++-----------------
moblin-image-creator.spec | 4 +++-
3 files changed, 22 insertions(+), 19 deletions(-)
New commits:
commit 7c8611ded3706f4f6badd1dc4c065a9b17507449
Author: Mitsutaka Amano <[EMAIL PROTECTED]>
Date: Mon Aug 25 12:09:14 2008 +0900
* Droped unnecessary %files entry in spec file. Cleaned dirty codes.
Diff in this email is a maximum of 400 lines.
diff --git a/debian/changelog b/debian/changelog
index f419de9..a873911 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -147,8 +147,9 @@ moblin-image-creator (0.45) UNRELEASED; urgency=low
[ Mitsutaka Amano ]
* Droped unnecessary codes. Added a Japanese localization.
+ * Droped unnecessary %files entry in spec file. Cleaned dirty codes.
- -- Mitsutaka Amano <[EMAIL PROTECTED]> Mon, 25 Aug 2008 09:24:57 +0900
+ -- Mitsutaka Amano <[EMAIL PROTECTED]> Mon, 25 Aug 2008 12:06:50 +0900
moblin-image-creator (0.44) gaston; urgency=low
diff --git a/libs/InstallImage.py b/libs/InstallImage.py
index 7d79ecd..47a9a2d 100755
--- a/libs/InstallImage.py
+++ b/libs/InstallImage.py
@@ -297,9 +297,9 @@ class InstallImage(object):
for count, kernel in enumerate(self.kernels):
version_str = kernel.split('vmlinuz-').pop().strip()
initrd_name = "initrd.img-" + version_str
- try:
- shutil.copy("/tmp/.tmp.initrd%d" % count,
os.path.join(self.target.fs_path, 'boot', initrd_name))
- except OSError:
+ try:
+ shutil.copy("/tmp/.tmp.initrd%d" % count,
os.path.join(self.target.fs_path, 'boot', initrd_name))
+ except OSError:
print _("shutil.copy failed. Ignored error")
self.kernels.pop(0)
if not os.path.exists("%s/boot/boot" % self.target.path):
@@ -318,10 +318,10 @@ class InstallImage(object):
self.bootfs_path = ''
def create_install_script(self, output_dir):
- try:
- shutil.copy(os.path.join(self.project.platform.path,
'install.sh'), output_dir)
- except OSError:
- print _("shutil.copy failed. Ignored error")
+ try:
+ shutil.copy(os.path.join(self.project.platform.path,
'install.sh'), output_dir)
+ except OSError:
+ print _("shutil.copy failed. Ignored error")
self.create_install_cfg(output_dir)
@@ -599,10 +599,10 @@ class LiveUsbImage(BaseUsbImage):
self.kernels.pop(0)
# Flashing yellow on a blue background
self.install_kernels("9e", image_type)
- try:
- pdk_utils.copy(self.rootfs_path, self.tmp_path)
- except OSError:
- print _("Could not copy rootfs_path. Ignored error")
+ try:
+ pdk_utils.copy(self.rootfs_path, self.tmp_path)
+ except OSError:
+ print _("Could not copy rootfs_path. Ignored error")
if fs_type == 'EXT3FS':
self.create_ext3fs_file(os.path.join(self.tmp_path, 'ext3fs.img'),
ext3fs_fs_size)
@@ -645,18 +645,18 @@ class InstallUsbImage(BaseUsbImage):
self.kernels.pop(0)
# Flashing yellow on a red background
self.install_kernels("ce", image_type)
- try:
+ try:
pdk_utils.copy(self.rootfs_path, self.tmp_path)
except OSError:
print _("Could not copy rootfs_path. Ignored error")
- try:
+ try:
pdk_utils.copy(self.bootfs_path, self.tmp_path)
except OSError:
print _("Could not copy bootfs_path. Ignored error")
- try:
- self.create_install_script(self.tmp_path)
- except OSError:
- print _("Could create install script. Ignored error")
+ try:
+ self.create_install_script(self.tmp_path)
+ except OSError:
+ print _("Could create install script. Ignored error")
self.umount_container()
self.delete_rootfs()
diff --git a/moblin-image-creator.spec b/moblin-image-creator.spec
index d79f1db..1999d1f 100644
--- a/moblin-image-creator.spec
+++ b/moblin-image-creator.spec
@@ -52,9 +52,11 @@ rm -rf %{buildroot}
/usr/share/applications/image-creator.desktop
/usr/share/locale/*/LC_MESSAGES/moblin-image-creator.mo
/usr/share/pdk/*
-/var/lib/moblin-image-creator/.empty
%changelog
+* Mon Aug 25 2008 Mitsutaka Amano <[EMAIL PROTECTED]>
+- Droped unnecessary %files entry.
+
* Thu Jul 31 2008 Mitsutaka Amano <[EMAIL PROTECTED]>
- Added Requires:.
_______________________________________________
Commits mailing list
[email protected]
https://www.moblin.org/mailman/listinfo/commits
