[Morphix-cvs] SF.net SVN: morphix:[2653] trunk/mmaker

[<pa...@us...>]

Revision: 2653
          http://morphix.svn.sourceforge.net/morphix/?rev=2653&view=rev
Author:   paul_c
Date:     2009-03-09 16:14:08 +0000 (Mon, 09 Mar 2009)

Log Message:
-----------
and for good measure, check other `rm` invocations..

Modified Paths:
--------------
    trunk/mmaker/libmorphix/makemodule.c
    trunk/mmaker/src/isomaker.c

Modified: trunk/mmaker/libmorphix/makemodule.c
===================================================================
--- trunk/mmaker/libmorphix/makemodule.c	2009-03-09 16:10:23 UTC (rev 2652)
+++ trunk/mmaker/libmorphix/makemodule.c	2009-03-09 16:14:08 UTC (rev 2653)
@@ -629,7 +629,7 @@
 		g_free(cmdline);
 
 
-		cmdline = g_strdup_printf("%s %s rm /%s",P_CHROOT,module->dirname,basename);
+		cmdline = g_strdup_printf("%s %s rm -f /%s",P_CHROOT,module->dirname,basename);
 		if (!ExecuteCommand(cmdline)) {
 			fprintf(stderr,"Warning: unable to remove local package after installation: %s\n",ptr->data);
 		}
@@ -676,7 +676,7 @@
 		}
 		g_free(cmdline);
 
-		cmdline = g_strdup_printf("%s %s rm /%s",P_CHROOT,module->dirname,basename);
+		cmdline = g_strdup_printf("%s %s rm -f /%s",P_CHROOT,module->dirname,basename);
 		if (!ExecuteCommand(cmdline)) {
 			fprintf(stderr,"Warning: unable to remove patch script after executing it: %s\n",ptr->data);
 		}
@@ -929,7 +929,7 @@
 				ExecuteCommand(cmdline);
 				g_free(cmdline);
 				
-				cmdline = g_strdup_printf("rm %s/%s", module->dirname, filename);
+				cmdline = g_strdup_printf("rm -f %s/%s", module->dirname, filename);
 				ExecuteCommand(cmdline);
 				g_free(cmdline);
 				

Modified: trunk/mmaker/src/isomaker.c
===================================================================
--- trunk/mmaker/src/isomaker.c	2009-03-09 16:10:23 UTC (rev 2652)
+++ trunk/mmaker/src/isomaker.c	2009-03-09 16:14:08 UTC (rev 2653)
@@ -175,10 +175,10 @@
 				executeCommandMain(cmdline);
 				g_free(cmdline);
 
-				cmdline = g_strdup_printf("sh -c \"rm %s/*.deb\"",workdir);
+				cmdline = g_strdup_printf("sh -c \"rm -f %s/*.deb\"",workdir);
 				executeCommandMain(cmdline);
 				g_free(cmdline);
-				cmdline = g_strdup_printf("sh -c \"rm %s/*.udeb\"",workdir);
+				cmdline = g_strdup_printf("sh -c \"rm -f %s/*.udeb\"",workdir);
 				executeCommandMain(cmdline);
 				g_free(cmdline);
 			}
@@ -436,7 +436,7 @@
 		ExecuteCommand(cmdline);
 		g_free(cmdline);
 
-		cmdline = g_strdup_printf("rm /tmp/tmp.iso");
+		cmdline = g_strdup_printf("rm -f /tmp/tmp.iso");
 		ExecuteCommand(cmdline);
 		g_free(cmdline);
 	


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.