[arch-commits] Commit in abs/repos (4 files)

[Allan McRae]

    Date: Tuesday, March 31, 2009 @ 10:00:32
  Author: allan
Revision: 32453

Merged revisions 32451 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/abs/trunk

........
  r32451 | allan | 2009-03-31 23:55:56 +1000 (Tue, 31 Mar 2009) | 1 line
  
  upgpkg: abs 2.3.2-2
........

Modified:
  abs/repos/testing-x86_64/	(properties)
  abs/repos/testing-x86_64/ChangeLog
  abs/repos/testing-x86_64/PKGBUILD
  abs/repos/testing-x86_64/abs.install

-------------+
 ChangeLog   |    5 +++++
 PKGBUILD    |    2 +-
 abs.install |   13 +++++++++----
 3 files changed, 15 insertions(+), 5 deletions(-)


Property changes on: abs/repos/testing-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /abs/trunk:1-32424
   + /abs/trunk:1-32452

Modified: testing-x86_64/ChangeLog
===================================================================
--- testing-x86_64/ChangeLog	2009-03-31 13:58:16 UTC (rev 32452)
+++ testing-x86_64/ChangeLog	2009-03-31 14:00:32 UTC (rev 32453)
@@ -1,5 +1,10 @@
 2009-03-31 Allan McRae <allan at archlinux.org>
 
+	* 2.3.2-2
+	Improve install script handling of non-existent directories in ABS tree
+
+2009-03-31 Allan McRae <allan at archlinux.org>
+
 	* 2.3.2-1
 	Fix potential permission issues in the ABS tree
 

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2009-03-31 13:58:16 UTC (rev 32452)
+++ testing-x86_64/PKGBUILD	2009-03-31 14:00:32 UTC (rev 32453)
@@ -3,7 +3,7 @@
 
 pkgname=abs
 pkgver=2.3.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Utilities to download and work with the Arch Build System (ABS)"
 arch=('i686' 'x86_64')
 url="http://projects.archlinux.org/git/?p=abs.git"

Modified: testing-x86_64/abs.install
===================================================================
--- testing-x86_64/abs.install	2009-03-31 13:58:16 UTC (rev 32452)
+++ testing-x86_64/abs.install	2009-03-31 14:00:32 UTC (rev 32453)
@@ -1,7 +1,12 @@
 pre_upgrade() {
     if [ "$(vercmp $2 2.3.2-1)" -lt 0 ]; then
-    echo "==> Fixing potential ABS tree permission issues (this may take a while...)"
-    find /var/abs/{core,extra,community,testing} -type d -exec chown root:root {} \;
-    find /var/abs/{core,extra,community,testing} -type d -exec chmod 755 {} \;
-  fi
+        echo "==> Fixing potential ABS tree permission issues (this may take a while...)"
+    
+        for dir in core extra community testing; do
+            if [ -d /var/abs/$dir ]; then
+                find /var/abs/$dir -type d -exec chown root:root {} \;
+                find /var/abs/$dir -type d -exec chmod 755 {} \;
+            fi
+        done
+    fi
 }