Bug 325561: Fix partial updates failing when people remove search plugins. r=darin.

tools/update-packaging/common.sh

@@ -49,11 +49,14 @@ make_add_instruction() {
 make_patch_instruction() {
   f="$1"
   is_extension=$(echo "$f" | grep -c 'extensions/.*/')
+  is_search_plugin=$(echo "$f" | grep -c 'searchplugins/.*')
   if [ $is_extension = "1" ]; then
     # Use the subdirectory of the extensions folder as the file to test
     # before performing this add instruction.
     testdir=$(echo "$f" | sed 's/\(extensions\/[^\/]*\)\/.*/\1/')
     echo "patch-if \"$testdir\" \"$f.patch\" \"$f\""
+  elif [ $is_search_plugin = "1" ]; then
+    echo "patch-if \"$f\" \"$f.patch\" \"$f\""
   else
     echo "patch \"$f.patch\" \"$f\""
   fi