diff options
| author |   Thomas Sachau <tommy@gentoo.org> | 2012-04-03 19:49:09 +0200 |
|---|---|---|
| committer | Thomas Sachau <tommy@gentoo.org> | 2012-04-03 19:49:15 +0200 |
| commit | 2b98a190e5393053c1eb092e66373214e2488199 (patch) | |
| tree | 4181820c7275322014cc793be992ba6b7deae1b5 /app-portage | |
| parent | net-misc/youtube-viewer: New Ebuild for bug 388921 thanks to Tommy[D] and ssu... (diff) | |
| download | sunrise-2b98a190e5393053c1eb092e66373214e2488199.tar.gz sunrise-2b98a190e5393053c1eb092e66373214e2488199.tar.bz2 sunrise-2b98a190e5393053c1eb092e66373214e2488199.zip | |
app-portage/overlay-utils: Version bump to fix a bug, when user forgot to rebase
Diffstat (limited to 'app-portage')
| -rw-r--r-- | app-portage/overlay-utils/ChangeLog | 6 | ||||
| -rw-r--r-- | app-portage/overlay-utils/Manifest | 6 | ||||
| -rw-r--r-- | app-portage/overlay-utils/files/sunrise-commit | 6 | ||||
| -rw-r--r-- | app-portage/overlay-utils/overlay-utils-0.3.1.ebuild (renamed from app-portage/overlay-utils/overlay-utils-0.3.ebuild) | 0 |
4 files changed, 15 insertions, 3 deletions
diff --git a/app-portage/overlay-utils/ChangeLog b/app-portage/overlay-utils/ChangeLog index d627fda5d..56a5f7499 100644 --- a/app-portage/overlay-utils/ChangeLog +++ b/app-portage/overlay-utils/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*overlay-utils-0.3.1 (03 Apr 2012) + + 03 Apr 2012; Thomas Sachau (Tommy[D]) <tommy@gentoo.org> + -overlay-utils-0.3.ebuild, +overlay-utils-0.3.1.ebuild, files/sunrise-commit: + Version bump to fix a bug, when user forgot to rebase + *overlay-utils-0.3 (02 Apr 2012) 02 Apr 2012; Thomas Sachau (Tommy[D]) <tommy@gentoo.org> diff --git a/app-portage/overlay-utils/Manifest b/app-portage/overlay-utils/Manifest index 4ac5ce904..29ba12bb8 100644 --- a/app-portage/overlay-utils/Manifest +++ b/app-portage/overlay-utils/Manifest @@ -1,5 +1,5 @@ -AUX sunrise-commit 7949 RMD160 eab827ea2a54a04d0f99ca7623c8949b2f3b039e SHA1 fa3d571682d3f88eb6f131d86cbd9d423c7e72dc SHA256 175cbd159ec89b5e69f7d51f995dfb69525c0afcce6092a785640f58b8eb5516 +AUX sunrise-commit 8131 RMD160 96514df7a595e7ac1521c06f50fab1f2ece62831 SHA1 00e7abe45ce58ab9bb4cf9870a86360c61f3593d SHA256 fc7f1f5599eba92e860d60ab8e199a90d9e3d3c7b0bbe285f4a7ace0a73b7f73 AUX sunrise-commit.1 7607 RMD160 52e4e7df66661705f05df4167b80e68cffaafddb SHA1 647084334a6d24c51d3f4052b1a469e56d09c078 SHA256 5b6c2b68eeb45f0eb864c0efb787e8622bb7d80119812218e45c82bb04926bd3 -EBUILD overlay-utils-0.3.ebuild 549 RMD160 00a30a17fef4a87b65ce2399d90640768932c465 SHA1 7beb95012785130f0feb78326e52f2c507b57d5e SHA256 07fb36b8dd23ad7b541a90b9047f185fa87817e253a242fb7d118ac577acc7c1 -MISC ChangeLog 3555 RMD160 e39896e6dc10705740df8c7ada6d36fd07364009 SHA1 c12ef43296ca93dc4f69265ce31b10dcb0d990e4 SHA256 239cfb090daac8aad16c28fd6044a5772b59415766cd6354e459f4f919470858 +EBUILD overlay-utils-0.3.1.ebuild 549 RMD160 00a30a17fef4a87b65ce2399d90640768932c465 SHA1 7beb95012785130f0feb78326e52f2c507b57d5e SHA256 07fb36b8dd23ad7b541a90b9047f185fa87817e253a242fb7d118ac577acc7c1 +MISC ChangeLog 3787 RMD160 792e1d791685bc5b117ec644e9dfdab4fbaf501c SHA1 1fd10f2178e87207939bacd70e127b8a2875b467 SHA256 14de1d11558ed42131abb067df8746ecfe7bcccda9606cb920e2d1bde2f4b1ad MISC metadata.xml 208 RMD160 c18611400760e42bdd001905be0a63c2e963bcea SHA1 595816105cac477cb85792a182e15888029118a1 SHA256 c4841c87f0c2b9b5e679a27dc72180be8d508fb3f5df0fbab2ec2c805c0a6d82 diff --git a/app-portage/overlay-utils/files/sunrise-commit b/app-portage/overlay-utils/files/sunrise-commit index bae31ed94..0f7b0bc2f 100644 --- a/app-portage/overlay-utils/files/sunrise-commit +++ b/app-portage/overlay-utils/files/sunrise-commit @@ -235,6 +235,12 @@ git_up() { ebegin "Updating working copy to latest version from repository" + # rebase does temporarily remove the current workdir, so the following push + # would fail because of the unknown workdir + while ! [[ -e .git ]] ; do + cd .. 2>/dev/null + done + if [[ $opt_verbose == 1 ]] ; then git pull --rebase -v origin master || set $? else diff --git a/app-portage/overlay-utils/overlay-utils-0.3.ebuild b/app-portage/overlay-utils/overlay-utils-0.3.1.ebuild index 30fceac68..30fceac68 100644 --- a/app-portage/overlay-utils/overlay-utils-0.3.ebuild +++ b/app-portage/overlay-utils/overlay-utils-0.3.1.ebuild |