Fix if statement by adding a file test.

Package-Manager: portage-2.2.0_alpha58/cvs/Linux x86_64

diff --git a/app-portage/layman/ChangeLog b/app-portage/layman/ChangeLog
index 97974aa09297918673bf5047e2082452f91584ba..c22154966c14db40002d505bbcf268c093f4c7fa 100644 (file)
--- a/app-portage/layman/ChangeLog
+++ b/app-portage/layman/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-portage/layman
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/ChangeLog,v 1.147 2011/09/17 21:15:08 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/ChangeLog,v 1.148 2011/09/18 23:21:11 idl0r Exp $
+
+  18 Sep 2011; Christian Ruppert <idl0r@gentoo.org> layman-2.0.0_rc3.ebuild,
+  layman-9999.ebuild:
+  Fix if statement by adding a file test.
 
 *layman-2.0.0_rc3 (17 Sep 2011)
 

diff --git a/app-portage/layman/Manifest b/app-portage/layman/Manifest
index 7195e8caa9ecb01f64e74a69dd2fc152c1dc89d2..c5e932324e3172877a2411c386b12162f295c16f 100644 (file)
--- a/app-portage/layman/Manifest
+++ b/app-portage/layman/Manifest
@@ -12,18 +12,18 @@ EBUILD layman-1.4.1.ebuild 2220 RMD160 f4099ff91ec3629415ca840684ad585aa44fc765
 EBUILD layman-1.4.2-r2.ebuild 2350 RMD160 aa857fcce59b2e7edb5a261626f63fcf09fa3e6a SHA1 b2e72bf5a44c7e1fe4fb824a86d95c886218fbf5 SHA256 c5399f0f4be804cbe1054c366655d88e34814fecb68c28434e4929e9b9464c01
 EBUILD layman-2.0.0_rc1-r1.ebuild 2604 RMD160 2ade8a43c517f249636acfba9bfafb5c67312570 SHA1 538a4adc709a8a04568478c6a294d3cb1a247d0c SHA256 8fc9a49f7edbe154d93aa5ca349cf1c075257cafebb120cf303b31cc7c1b0d7e
 EBUILD layman-2.0.0_rc2.ebuild 2432 RMD160 e1c5de1ddf7db212d65e0ddc56ec554a9ce9fb0d SHA1 ac23f006ca1957bbf72b9417ad43520e888c3302 SHA256 43269be26c2902baa1aab077bfee8e84b71e01d6518d2c47c348be9dfd3f6de1
-EBUILD layman-2.0.0_rc3.ebuild 2801 RMD160 a8510e0ba4f85e0b1c492a2dd9b11d91b710ed54 SHA1 e3babaafd94687db0c59f15d9a93912ad3d394d1 SHA256 0a483b5dd78b60130fba8378cb118f0ba686e9889e6d01449452db8f540027ae
-EBUILD layman-9999.ebuild 2768 RMD160 a3d7493f8e86668e0a81e0979328c44b214fe2ec SHA1 294d3f7734f02d3738a1df5a1366e8c7a4e25fb7 SHA256 486fb708405dab9660f4630ecf5a79cb6f672b6ce82213db4e38f608fd88a98b
-MISC ChangeLog 22048 RMD160 64ead9674c25085873f41336604ce76fee5862e1 SHA1 cfa3162187b8a97cb94c3f72c3344f36fbdb7859 SHA256 4631e22a3dcb9deba3dde6c8486e08dba998c6725c793a412218f3bad32c3351
+EBUILD layman-2.0.0_rc3.ebuild 2808 RMD160 b9b753ede66b5bfbc1f1f7125687f88578ebfb3c SHA1 73f3fc4384bfe11c0127580725e80a83971ea2f2 SHA256 3bbd04b443b30225c00c257f1eeb62491773a3eb6390e90de9a3db8635a6f87a
+EBUILD layman-9999.ebuild 2775 RMD160 a6f6443e1ec8657b3a4bb8a812d2f88d04c47f83 SHA1 2c9f7c3592abb248abe976a708f261b9d3770006 SHA256 4e45660ae32587da712f4eb6bf6a387b1fdd6fe2223acc1bff376222227a25c8
+MISC ChangeLog 22190 RMD160 993e9719e76680ee3dfc9768dd4a77668b00e1bc SHA1 60c624ce2ab714a9686df30a2de3913373b6af89 SHA256 cd7d42b2fd1f09f350d7b56094999413d5ba20d294e10f7d582e0caff25157f8
 MISC metadata.xml 756 RMD160 3659553fed97aec8d38202e4e8753c9fba845493 SHA1 914504bda21647e11d258f2b2e6e955b8571e455 SHA256 04c1d9b81309254232aabeedc973e1f4c9f7300fdeeb95d364846f4c98bc347c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCAAGBQJOdQ3iAAoJEMOx0zmdw4Z1SvwH/ign6uUfokz3oFbFuEmh52VG
-nt9oCJItUR9MQJsuetSgUEMJBFXfOdsvopqdBX4lns90PThAbEB7JpftbX3sq5a4
-MIB84LT19xqvmc0kiuwMXWWvZnepFLStERd2QksfI/c2z0QxvAe194Wbl8m/xI+i
-0YSLVi3PFaKV/qpP5CqdfNn4DrCN/jHzN14NweG1GTAMqGAEukvIfUdsxa4cgi/1
-Eih0HQIVdeI8aowCKKiN3a7ud1bOeBg8uGfrjo64hKI5T0hY76HK7yoXwvq6UnGQ
-k7YkZrM/cgYp2rIpi+X7ZADho3t+P9ioDTUUjPBl/SD0qrRCtYBBk/RF30adftk=
-=T1TF
+iQEcBAEBCAAGBQJOdnztAAoJEMOx0zmdw4Z1Q4EIAKlPSKcjWoy4YYK/kLPYHjL7
+GKh43q/7qpqMmmbiPZepG6a2LryOIdbxLeugqPcCdxNAXnDXc5JngwFiSG9QPnso
+6zB0priWFxGtyZHGhvHVpXL5S+LIYU0LDq1xs0oFMn+3OjvJwbW2Wg8rkwZ2k/WP
+ffhMLeKohW6lRV6/HOjAPFO45Wwq5gNwlRY6ws2KICA8TlIWjMvQpZkU6cWSdEVy
+wA4WF3nNC9+SrVDHznsh9RgF0JpmxhMb9zc+A+GBdWjqAHugBKUZXXg6e9WnuPzb
+NGofLVotHFiSTy4l8wxGPsZGGAA8/OWbbSarUj0huDPUS6QXkiKveRIkrUjr88o=
+=i92a
 -----END PGP SIGNATURE-----

diff --git a/app-portage/layman/layman-2.0.0_rc3.ebuild b/app-portage/layman/layman-2.0.0_rc3.ebuild
index b1f9365ff40ac78e47d96ab05d67e2ea747a2d72..194f6e4e5a7845ce0f01bb1b74f36c43b81a9860 100644 (file)
--- a/app-portage/layman/layman-2.0.0_rc3.ebuild
+++ b/app-portage/layman/layman-2.0.0_rc3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-2.0.0_rc3.ebuild,v 1.1 2011/09/17 21:15:08 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-2.0.0_rc3.ebuild,v 1.2 2011/09/18 23:21:11 idl0r Exp $
 
 EAPI="3"
 SUPPORT_PYTHON_ABIS="1"
@@ -67,7 +67,7 @@ pkg_postinst() {
        ewarn "The installed db file '%(storage)/overlays.xml'"
        ewarn "has been renamed to '%(storage)/installed.xml'"
 
-       if "${EROOT}/var/lib/layman/overlays.xml"; then
+       if [ -f "${EROOT}/var/lib/layman/overlays.xml" ]; then
                mv "${EROOT}/var/lib/layman/overlays.xml" "${EROOT}/var/lib/layman/installed.xml"
                einfo "${EROOT}/var/lib/layman/overlays.xml has been moved to ${EROOT}/var/lib/layman/installed.xml"
        fi

diff --git a/app-portage/layman/layman-9999.ebuild b/app-portage/layman/layman-9999.ebuild
index 937613cd3f55ce16278722effb406b738f05cf52..a9bab6dc602167337a539fa8bd8b13e9052c267f 100644 (file)
--- a/app-portage/layman/layman-9999.ebuild
+++ b/app-portage/layman/layman-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-9999.ebuild,v 1.22 2011/09/17 21:15:08 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-9999.ebuild,v 1.23 2011/09/18 23:21:11 idl0r Exp $
 
 EAPI="3"
 SUPPORT_PYTHON_ABIS="1"
@@ -75,7 +75,7 @@ pkg_postinst() {
        ewarn "The installed db file '%(storage)/overlays.xml'"
        ewarn "has been renamed to '%(storage)/installed.xml'"
 
-       if "${EROOT}/var/lib/layman/overlays.xml"; then
+       if [ -f "${EROOT}/var/lib/layman/overlays.xml" ]; then
                mv "${EROOT}/var/lib/layman/overlays.xml" "${EROOT}/var/lib/layman/installed.xml"
                einfo "${EROOT}/var/lib/layman/overlays.xml has been moved to ${EROOT}/var/lib/layman/installed.xml"
        fi