From acf434e17c779daa599fd5e8c8b6e39e541d4af3 Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Jan 30 2014 06:27:03 +0000 Subject: cmake-fedora-fedpkg -d will now create missing dir --- diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 0000000..e83228b --- /dev/null +++ b/AUTHORS @@ -0,0 +1,3 @@ +Main author: +Ding-Yi Chen + diff --git a/ChangeLog b/ChangeLog index 5dd2ffa..251cf8c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -* Tue Jan 28 2014 Ding-Yi Chen - 1.2.4 +* Thu Jan 30 2014 Ding-Yi Chen - 1.2.6 - Resolves Bug 1058631 - ManagePRM generate Broken %defattr - Enhancement: + ManageTarget: ADD_CUSTOM_TARGET_COMMAND: NO_FORCE: new option. diff --git a/Modules/ManageReleaseFedora.cmake b/Modules/ManageReleaseFedora.cmake index 579ea5c..192fa82 100644 --- a/Modules/ManageReleaseFedora.cmake +++ b/Modules/ManageReleaseFedora.cmake @@ -118,7 +118,7 @@ IF(NOT DEFINED _MANAGE_RELEASE_FEDORA_) CACHE FILEPATH "Bodhi template file" ) - GET_ENV(FEDPKG_DIR "${CMAKE_BINARY_DIR}/FedPkg" CACHE PATH "FedPkg dir") + GET_ENV(FEDPKG_DIR "${CMAKE_FEDORA_TMP_DIR}/FedPkg" CACHE PATH "FedPkg dir") GET_FILENAME_COMPONENT(_FEDPKG_DIR_NAME ${FEDPKG_DIR} NAME) LIST(APPEND SOURCE_ARCHIVE_IGNORE_FILES "/${_FEDPKG_DIR_NAME}/") diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 86bb8ec..efc2fe5 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -1,4 +1,4 @@ -PRJ_VER=1.2.4 +PRJ_VER=1.2.6 SUMMARY=Resolves Bug 1058631 REDHAT_BUGZILLA=1058631 [Changes] diff --git a/scripts/cmake-fedora-fedpkg b/scripts/cmake-fedora-fedpkg index c3a8cfe..ca580bb 100755 --- a/scripts/cmake-fedora-fedpkg +++ b/scripts/cmake-fedora-fedpkg @@ -168,8 +168,10 @@ if [[ -n "$BUGS" ]];then fi if [[ ! -w $WORK_DIR ]];then - echo "$WORK_DIR is not writable." > /dev/stderr - exit -2 + if ! mkdir -p $WORK_DIR; then + echo "$WORK_DIR is not writable." > /dev/stderr + exit 2 + fi fi echo "WORK_DIR=$WORK_DIR" > /dev/stderr