fix same-version mechanism
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=24
This commit is contained in:
parent
00917f3eef
commit
b6753f4717
@ -6,7 +6,7 @@ Fri Aug 26 06:49:13 UTC 2011 - adrian@suse.de
|
|||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Aug 26 06:45:17 UTC 2011 - adrian@suse.de
|
Fri Aug 26 06:45:17 UTC 2011 - adrian@suse.de
|
||||||
|
|
||||||
- link old tar ball into result directory when no new commit appeared
|
- drop broken code for same-commit-detection as suggested by Markus
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Aug 25 16:17:02 UTC 2011 - markus.lehtonen@linux.intel.com
|
Thu Aug 25 16:17:02 UTC 2011 - markus.lehtonen@linux.intel.com
|
||||||
|
24
tar_scm
24
tar_scm
@ -151,12 +151,6 @@ if [ "$MYSCM" == "svn" ]; then
|
|||||||
fi
|
fi
|
||||||
NEWVERSION=`LC_ALL=C svn info | sed -n 's,^Last Changed Rev: \(.*\),\1,p'`
|
NEWVERSION=`LC_ALL=C svn info | sed -n 's,^Last Changed Rev: \(.*\),\1,p'`
|
||||||
cd -
|
cd -
|
||||||
if [ "$OLDVERSION" == "$NEWVERSION" ]; then
|
|
||||||
# cleanup and skip
|
|
||||||
rm -rf "$TAR_DIRECTORY"
|
|
||||||
cp -l "$existing_tar" "${existing_tar##*:}"
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
mv "$TAR_DIRECTORY" "${FILE}" || exit 1
|
mv "$TAR_DIRECTORY" "${FILE}" || exit 1
|
||||||
else
|
else
|
||||||
# new checkout
|
# new checkout
|
||||||
@ -191,12 +185,6 @@ elif [ "$MYSCM" == "git" ]; then
|
|||||||
fi
|
fi
|
||||||
NEWVERSION=`git show --pretty=%at | head -n 1`
|
NEWVERSION=`git show --pretty=%at | head -n 1`
|
||||||
cd -
|
cd -
|
||||||
if [ "$OLDVERSION" == "$NEWVERSION" ]; then
|
|
||||||
# cleanup and skip
|
|
||||||
rm -rf "$TAR_DIRECTORY"
|
|
||||||
cp -l "$existing_tar" "${existing_tar##*:}"
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
mv "$TAR_DIRECTORY" "${FILE}" || exit 1
|
mv "$TAR_DIRECTORY" "${FILE}" || exit 1
|
||||||
else
|
else
|
||||||
# new checkout
|
# new checkout
|
||||||
@ -221,12 +209,6 @@ elif [ "$MYSCM" == "hg" ]; then
|
|||||||
hg pull || exit 1
|
hg pull || exit 1
|
||||||
NEWVERSION=`hg id -i -rtip`
|
NEWVERSION=`hg id -i -rtip`
|
||||||
cd -
|
cd -
|
||||||
if [ "$OLDVERSION" == "$NEWVERSION" ]; then
|
|
||||||
# cleanup and skip
|
|
||||||
rm -rf "$TAR_DIRECTORY"
|
|
||||||
cp -l "$existing_tar" "${existing_tar##*:}"
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
mv "$TAR_DIRECTORY" "${FILE}" || exit 1
|
mv "$TAR_DIRECTORY" "${FILE}" || exit 1
|
||||||
else
|
else
|
||||||
# new checkout
|
# new checkout
|
||||||
@ -255,12 +237,6 @@ elif [ "$MYSCM" == "bzr" ]; then
|
|||||||
fi
|
fi
|
||||||
NEWVERSION=`bzr revno`
|
NEWVERSION=`bzr revno`
|
||||||
cd -
|
cd -
|
||||||
if [ "$OLDVERSION" == "$NEWVERSION" ]; then
|
|
||||||
# cleanup and skip
|
|
||||||
rm -rf "$TAR_DIRECTORY"
|
|
||||||
cp -l "$existing_tar" "${existing_tar##*:}"
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
mv "$TAR_DIRECTORY" "${FILE}" || exit 1
|
mv "$TAR_DIRECTORY" "${FILE}" || exit 1
|
||||||
else
|
else
|
||||||
# new checkout
|
# new checkout
|
||||||
|
Loading…
x
Reference in New Issue
Block a user