diff options
| author |   heracles <heracles@localhost> | 2007-10-04 20:11:05 +0000 |
|---|---|---|
| committer | heracles <heracles@localhost> | 2007-10-04 20:11:05 +0000 |
| commit | 0af60a7a3b25fc4a000c3b9dbd6ce2e7a6eaae82 (patch) | |
| tree | 22245a2548e7c6a657e4b68d9b0d35ff62c2a683 | |
| parent | dev-db/postgresql-{libs,client,server,docs}-{7.3,7.4,8.0,8.1,8.2}: minors bump (diff) | |
| download | experimental-0af60a7a3b25fc4a000c3b9dbd6ce2e7a6eaae82.tar.gz experimental-0af60a7a3b25fc4a000c3b9dbd6ce2e7a6eaae82.tar.bz2 experimental-0af60a7a3b25fc4a000c3b9dbd6ce2e7a6eaae82.zip | |
app-admin/eselect-postgresql: cleanup and fixes
svn path=/experimental/; revision=290
| -rw-r--r-- | app-admin/eselect-postgresql/Manifest | 8 | ||||
| -rw-r--r-- | app-admin/eselect-postgresql/files/postgresql.eselect | 30 |
2 files changed, 6 insertions, 32 deletions
diff --git a/app-admin/eselect-postgresql/Manifest b/app-admin/eselect-postgresql/Manifest index e9ff432..4079daf 100644 --- a/app-admin/eselect-postgresql/Manifest +++ b/app-admin/eselect-postgresql/Manifest @@ -2,10 +2,10 @@ AUX binwrapper 515 RMD160 774f14cc09d6534800e91845e2c4b40b9911af11 SHA1 b9598d62 MD5 5f952f5a5b44bdc6f6cbc4381f6eee86 files/binwrapper 515 RMD160 774f14cc09d6534800e91845e2c4b40b9911af11 files/binwrapper 515 SHA256 99d4774e841f0057fdbf141b9b123975939eac1e5ab6e711d08c44b4adc2b4d1 files/binwrapper 515 -AUX postgresql.eselect 7982 RMD160 10ad641ddf2032fcc9103041e1f90fc03c1febf4 SHA1 15b467da41797fe3596175ac3b8ed474a10ecf43 SHA256 e35befa17c4f37eda2a6e3879258cebc4c29136a5bb4cb134840cf5281cc81dc -MD5 33fd7ef8e80d54fc63b133420fe0fcc6 files/postgresql.eselect 7982 -RMD160 10ad641ddf2032fcc9103041e1f90fc03c1febf4 files/postgresql.eselect 7982 -SHA256 e35befa17c4f37eda2a6e3879258cebc4c29136a5bb4cb134840cf5281cc81dc files/postgresql.eselect 7982 +AUX postgresql.eselect 7058 RMD160 e9b2af5facf429ce03789a6c90daf6b04ede558d SHA1 04b614f2020d0c286acc3d6f1e9fc59b5eec80ff SHA256 d80099016728799cc23445019b623505834c899a91bca4695d38d888bfaed11f +MD5 15d855b8509e4cc4625582ec07b5b6ef files/postgresql.eselect 7058 +RMD160 e9b2af5facf429ce03789a6c90daf6b04ede558d files/postgresql.eselect 7058 +SHA256 d80099016728799cc23445019b623505834c899a91bca4695d38d888bfaed11f files/postgresql.eselect 7058 EBUILD eselect-postgresql-0.2.ebuild 1449 RMD160 d5380e32102d907cb761b329b3a4ca83dcb6dd57 SHA1 2de0220975229e8d972b35916182f5532758c693 SHA256 befbba09c754e4edc8a374fe1641781918030de8164f1ada666b6756ead732bd MD5 aa6b6a4a06abf7dd6707bebbefa0f36f eselect-postgresql-0.2.ebuild 1449 RMD160 d5380e32102d907cb761b329b3a4ca83dcb6dd57 eselect-postgresql-0.2.ebuild 1449 diff --git a/app-admin/eselect-postgresql/files/postgresql.eselect b/app-admin/eselect-postgresql/files/postgresql.eselect index 8f7f8f3..e48fb13 100644 --- a/app-admin/eselect-postgresql/files/postgresql.eselect +++ b/app-admin/eselect-postgresql/files/postgresql.eselect @@ -184,11 +184,6 @@ VERSION=$(svn_date_to_version "${SVN_DATE}" ) do_reset() { local alibdir='/usr/lib/' if [[ -d "$(canonicalise /etc/eselect/postgresql/active)" ]] ; then - unset postgres_symlinks - unset postgres_bindir - for src in /etc/eselect/postgresql/active/* ; do - [[ -f "${src}" ]] && source "${src}" - done if [[ -r /etc/eselect/postgresql/active.links ]] ; then exec 9</etc/eselect/postgresql/active.links || die "Failed to access the list of links" while IFS='' read -u 9 slink ; do @@ -200,30 +195,9 @@ VERSION=$(svn_date_to_version "${SVN_DATE}" ) fi fi done - else # the code below is obsolete now, but i'll keep it around for a while - local pgconfig="${postgres_bindir}/pg_config" - [[ -x "${pgconfig}" ]] || die -q "Broken install: no pg_config found" - local pglibdir="$(${pgconfig} --libdir)" - [[ -d "${pglibdir}" ]] || die -q "Failed to find postgresql libdir" - local slinks="${#postgres_symlinks[*]}" - for l in ${pglibdir}/lib*.{a,so} ; do - local bn=$(basename $l) - postgres_symlinks[slinks++]="$l" - postgres_symlinks[slinks++]="${alibdir}${bn}" - done - for (( i=0;i<slinks;i++ )); do - local s=${postgres_symlinks[i++]}; - local d=${postgres_symlinks[i]}; - [[ -e "${s}" ]] || continue - if [[ -e "$d" ]] ; then - if [[ -L "$d" ]] ; then - rm -f "${d}" - else - write_warning_msg "$d exists and is not a symbolic link" - fi - fi - done + rm -f /etc/eselect/postgresql/active.links fi + rm -f /etc/eselect/postgresql/active fi } ## }}} |