summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Robbins <drobbins@gentoo.org>2000-11-01 22:53:48 +0000
committerDaniel Robbins <drobbins@gentoo.org>2000-11-01 22:53:48 +0000
commit4469e16da0d135ebbe984d4780564cae0e0525ff (patch)
tree8b6e213c07f69ab56fc658460ec89696f85b22b0 /sys-apps
parentAdded author's e-mail address to header. Fixed typo. No functionality (diff)
downloadgentoo-2-4469e16da0d135ebbe984d4780564cae0e0525ff.tar.gz
gentoo-2-4469e16da0d135ebbe984d4780564cae0e0525ff.tar.bz2
gentoo-2-4469e16da0d135ebbe984d4780564cae0e0525ff.zip
fileutils upgrade and portage fix
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/fileutils/files/digest-fileutils-4.0.301
-rw-r--r--sys-apps/fileutils/fileutils-4.0.30.ebuild (renamed from sys-apps/fileutils/fileutils-4.0.29.ebuild)2
-rw-r--r--sys-apps/portage/files/portage.py18
3 files changed, 13 insertions, 8 deletions
diff --git a/sys-apps/fileutils/files/digest-fileutils-4.0.30 b/sys-apps/fileutils/files/digest-fileutils-4.0.30
new file mode 100644
index 000000000000..981f7a321e43
--- /dev/null
+++ b/sys-apps/fileutils/files/digest-fileutils-4.0.30
@@ -0,0 +1 @@
+MD5 dc6d2bb572cec5a1429f7216ea3c97dd fileutils-4.0.30.tar.gz
diff --git a/sys-apps/fileutils/fileutils-4.0.29.ebuild b/sys-apps/fileutils/fileutils-4.0.30.ebuild
index db6949b811fa..5082f136e45c 100644
--- a/sys-apps/fileutils/fileutils-4.0.29.ebuild
+++ b/sys-apps/fileutils/fileutils-4.0.30.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2000 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License, v2 or later
# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/fileutils/fileutils-4.0.29.ebuild,v 1.1 2000/10/31 19:58:54 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/fileutils/fileutils-4.0.30.ebuild,v 1.1 2000/11/01 22:53:48 drobbins Exp $
A=${P}.tar.gz
S=${WORKDIR}/${P}
diff --git a/sys-apps/portage/files/portage.py b/sys-apps/portage/files/portage.py
index d1fde200bc25..77a3ebaf0b53 100644
--- a/sys-apps/portage/files/portage.py
+++ b/sys-apps/portage/files/portage.py
@@ -84,11 +84,15 @@ def isfifo(x):
def movefile(src,dest):
"""moves a file from src to dest, preserving all permissions and attributes."""
- if dest!="/bin/cp":
+ if dest=="/bin/cp":
+ getstatusoutput("/bin/mv /bin/cp /bin/cp.old")
+ a=getstatusoutput("/bin/cp.old -a "+"'"+src+"' /bin/cp")
+ os.unlink("/bin/cp.old")
+ else:
if os.path.exists(dest):
os.unlink(dest)
+ a=getstatusoutput("/bin/cp -a "+"'"+src+"' '"+dest+"'")
mymode=os.lstat(src)[ST_MODE]
- a=getstatusoutput("/bin/cp -a "+"'"+src+"' '"+dest+"'")
os.chmod(dest,mymode)
os.unlink(src)
if a[0]==0:
@@ -104,15 +108,15 @@ def md5(x):
def prepare_db(mycategory,mypackage):
if not os.path.isdir(root+"var"):
- os.mkdir(root+"var",0755)
+ os.mkdir(root+"var",0755)
if not os.path.isdir(root+"var/db"):
- os.mkdir(root+"var/db",0755)
+ os.mkdir(root+"var/db",0755)
if not os.path.isdir(root+"var/db/pkg"):
- os.mkdir(root+"var/db/pkg",0755)
+ os.mkdir(root+"var/db/pkg",0755)
if not os.path.isdir(root+"var/db/pkg/"+mycategory):
- os.mkdir(root+"var/db/pkg/"+mycategory,0755)
+ os.mkdir(root+"var/db/pkg/"+mycategory,0755)
if not os.path.isdir(root+"var/db/pkg/"+mycategory+"/"+mypackage):
- os.mkdir(root+"var/db/pkg/"+mycategory+"/"+mypackage,0755)
+ os.mkdir(root+"var/db/pkg/"+mycategory+"/"+mypackage,0755)
def pathstrip(x,mystart):
cpref=os.path.commonprefix([x,mystart])