From 7be882ea46203b4b65909a0e02fcba2a23b8288a Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Mon, 26 Mar 2012 04:45:16 +0000
Subject: [PATCH] =?UTF-8?q?=E3=83=AA=E3=83=93=E3=82=B8=E3=83=A7=E3=83=B3?=
 =?UTF-8?q?=20672-673=20=E3=82=92=20trunk/ConsoleDataMigration=20=E3=81=8B?=
 =?UTF-8?q?=E3=82=89=E3=83=9E=E3=83=BC=E3=82=B8:=20DESCRIPTION=5FDBM=5FFIL?=
 =?UTF-8?q?E=5FNOT=5FFOUND=E3=81=AE=E3=83=8F=E3=83=B3=E3=83=89=E3=83=AA?=
 =?UTF-8?q?=E3=83=B3=E3=82=B0=E6=8A=9C=E3=81=91=E3=82=92=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=20........?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_Repair@675 385bec56-5757-e545-9c3a-d8741f4650f1
---
 .../sources/ConsoleBackup/SavedataChecker.cpp          |  3 ++-
 branches/1stNUP_for_2ndNUP/sources/build.sh            | 10 ++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/branches/1stNUP_for_2ndNUP/sources/ConsoleBackup/SavedataChecker.cpp b/branches/1stNUP_for_2ndNUP/sources/ConsoleBackup/SavedataChecker.cpp
index f0e9ade..c96bd93 100644
--- a/branches/1stNUP_for_2ndNUP/sources/ConsoleBackup/SavedataChecker.cpp
+++ b/branches/1stNUP_for_2ndNUP/sources/ConsoleBackup/SavedataChecker.cpp
@@ -15,6 +15,7 @@
 
 #include <nn/fs/fs_ApiSysSaveData.h>
 #include <nn/fs/fs_ApiSharedExtSaveData.h>
+#include <nn/fs/fs_ResultPrivate.h>
 
 #include "SavedataChecker.h"
 #include "CommonLogger.h"
@@ -431,7 +432,7 @@ nn::Result SharedExtSavedataChecker::CleanUp(bool erase)
         else
         {
             // アーカイブごと削除する
-            if(result <= nn::fs::ResultVerificationFailed())
+            if(result <= nn::fs::ResultVerificationFailed() || result <= nn::fs::ResultDbmFileNotFound())
             {
                 NN_LOG("Mount Error: %x\n", IdArray[i]);
 
diff --git a/branches/1stNUP_for_2ndNUP/sources/build.sh b/branches/1stNUP_for_2ndNUP/sources/build.sh
index 2d04d5a..7549f08 100755
--- a/branches/1stNUP_for_2ndNUP/sources/build.sh
+++ b/branches/1stNUP_for_2ndNUP/sources/build.sh
@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
 
+set -u
+set -e
+
 # �o�[�W�����擾
 function getVersion
 {
@@ -10,6 +13,8 @@ function getVersion
 }
 
 # �t���O����
+releaseBuild=false;
+unfixedKeyBuild=false
 for arg in $@
 do
     if [ "$arg" = 'RELEASE' ]; then
@@ -21,11 +26,12 @@ do
     fi
 done
 
-if [ $releaseBuild ] ; then
+OPTION=""
+if [ $releaseBuild == "true" ] ; then
     getVersion
     BUILD_TYPE=release,development
     OPTION="PROD_BUILD=true $VERSION_STR"
-elif [ $unfixedKeyBuild ] ; then
+elif [ $unfixedKeyBuild == "true" ] ; then
     getVersion
     BUILD_TYPE=release,development
     OPTION="UNFIXEDKEY_BUILD=true $VERSION_STR"