Skip to contentSkip to conversation

stop trying to remove folders that do not exist

PATCH In review Stephano Cetola 3 participants 4 messages Jul 15, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 stop trying to remove folders that do not exist

From: Stephano Cetola <[email protected]>

The directory ${D}/${TMPDIR} does not exist. This patch removes code that was calling rm and rmdir on that location.

---
 meta-oe/recipes-devtools/php/php.inc |    6 ++++++
 1 file changed, 6 insertions(+)
meta-oe/recipes-devtools/php/php.inc +6 -0
index b1bf79c..000316b 100644
@@ -90,6 +90,12 @@ do_install_append_pn-php() {
     sed -i 's:=/var:=${localstatedir}:g' ${B}/sapi/fpm/init.d.php-fpm
     install -m 0755 ${B}/sapi/fpm/init.d.php-fpm ${D}${sysconfdir}/init.d/php-fpm
     TMP=`dirname ${D}/${TMPDIR}`
+    bbwarn "D"
+    bbwarn ${D}
+    bbwarn "TMPDIR"
+    bbwarn ${TMPDIR}
+    bbwarn "TMP"
+    bbwarn ${TMP}
     while test ${TMP} != ${D}; do
         rmdir ${TMP}
         TMP=`dirname ${TMP}`;
Signature · 1 line
1.7.10.4
#1 lore raw
Quoted 18 lines · Stephano Cetola

From: Stephano Cetola <[email protected]>

The directory ${D}/${TMPDIR} does not exist. This patch removes code that was calling rm and rmdir on that location.

---
  meta-oe/recipes-devtools/php/php.inc |    6 ++++++
  1 file changed, 6 insertions(+)
meta-oe/recipes-devtools/php/php.inc +0 -0
index b1bf79c..000316b 100644
@@ -90,6 +90,12 @@ do_install_append_pn-php() {
      sed -i 's:=/var:=${localstatedir}:g' ${B}/sapi/fpm/init.d.php-fpm
      install -m 0755 ${B}/sapi/fpm/init.d.php-fpm ${D}${sysconfdir}/init.d/php-fpm

meta-oe/recipes-devtools/php/php.inc do_install_append_pn-php() { · line 101

Quoted 10 lines
meta-oe/recipes-devtools/php/php.inc +6 -0
      TMP=`dirname ${D}/${TMPDIR}`
+    bbwarn "D"
+    bbwarn ${D}
+    bbwarn "TMPDIR"
+    bbwarn ${TMPDIR}
+    bbwarn "TMP"
+    bbwarn ${TMP}
      while test ${TMP} != ${D}; do
          rmdir ${TMP}
          TMP=`dirname ${TMP}`;

The actual patch does not do what the summary claims. Are you sure this is what you wanted to send/commit?

Signature · 4 lines
------------------------------------------------------------
Gary Thomas                 |  Consulting for the
MLB Associates              |    Embedded world
------------------------------------------------------------
#2 lore raw
In reply to Stephano Cetola
Quoted 4 lines · Stephano Cetola

From: Stephano Cetola <[email protected]>

The directory ${D}/${TMPDIR} does not exist. This patch removes code that was calling rm and rmdir on that location.

this doesn't match with the diff

Quoted 31 lines
---
 meta-oe/recipes-devtools/php/php.inc |    6 ++++++
 1 file changed, 6 insertions(+)
meta-oe/recipes-devtools/php/php.inc +6 -0
index b1bf79c..000316b 100644
@@ -90,6 +90,12 @@ do_install_append_pn-php() {
     sed -i 's:=/var:=${localstatedir}:g' ${B}/sapi/fpm/init.d.php-fpm
     install -m 0755 ${B}/sapi/fpm/init.d.php-fpm ${D}${sysconfdir}/init.d/php-fpm
     TMP=`dirname ${D}/${TMPDIR}`
+    bbwarn "D"
+    bbwarn ${D}
+    bbwarn "TMPDIR"
+    bbwarn ${TMPDIR}
+    bbwarn "TMP"
+    bbwarn ${TMP}
     while test ${TMP} != ${D}; do
         rmdir ${TMP}
         TMP=`dirname ${TMP}`;
Signature · 7 lines
1.7.10.4

-- 
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#3 lore raw
In reply to Stephano Cetola

meta-oe/recipes-

Quoted 12 lines · Stephano Cetola <stephanoc <at> gmail.com> writes:

From: Stephano Cetola <scetola <at> reachtech.com>

The directory ${D}/${TMPDIR} does not exist. This patch removes code that was calling rm and rmdir on that location.

Signed-off-by Stephano Cetola <scetola <at> reachtech.com>
---
 meta-oe/recipes-devtools/php/php.inc |    6 ++++++
 1 file changed, 6 insertions(+)
meta-oe/recipes- renamed from meta-oe/recipes-devtools/php/php.inc +0 -0

devtools/php/php.inc

meta-oe/recipes-devtools/php/php.inc

Quoted 6 lines

index b1bf79c..000316b 100644

meta-oe/recipes-devtools/php/php.inc +0 -0
 <at>  <at>  -90,6 +90,12  <at>  <at>  do_install_append_pn-php() {
     sed -i 's:=/var:=${localstatedir}:g' ${B}/sapi/fpm/init.d.php-fpm
     install -m 0755 ${B}/sapi/fpm/init.d.php-fpm 

${D}${sysconfdir}/init.d/php-fpm

meta-oe/recipes-devtools/php/php.inc do_install_append_pn-php() { · line 101

Quoted 10 lines
     TMP=`dirname ${D}/${TMPDIR}`
meta-oe/recipes-devtools/php/php.inc +6 -0
+    bbwarn "D"
+    bbwarn ${D}
+    bbwarn "TMPDIR"
+    bbwarn ${TMPDIR}
+    bbwarn "TMP"
+    bbwarn ${TMP}
     while test ${TMP} != ${D}; do
         rmdir ${TMP}
         TMP=`dirname ${TMP}`;

Sorry for the mixup. I was ssh'd into my testing machine at work and thought I was committing from my local machine. I have resubmitted. Sorry for the confusion.

-Stephano