[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Rdiff-backup-commits] rdiff-backup CHANGELOG dist/makedist
From: |
Andrew Ferguson |
Subject: |
[Rdiff-backup-commits] rdiff-backup CHANGELOG dist/makedist |
Date: |
Mon, 23 Jun 2008 02:30:21 +0000 |
CVSROOT: /sources/rdiff-backup
Module name: rdiff-backup
Changes by: Andrew Ferguson <owsla> 08/06/23 02:30:21
Modified files:
. : CHANGELOG
dist : makedist
Log message:
Get makedist working on Windows. (Patch from Josh Nisly)
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/CHANGELOG?cvsroot=rdiff-backup&r1=1.277&r2=1.278
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/dist/makedist?cvsroot=rdiff-backup&r1=1.28&r2=1.29
Patches:
Index: CHANGELOG
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/CHANGELOG,v
retrieving revision 1.277
retrieving revision 1.278
diff -u -b -r1.277 -r1.278
--- CHANGELOG 18 Jun 2008 00:59:34 -0000 1.277
+++ CHANGELOG 23 Jun 2008 02:30:21 -0000 1.278
@@ -1,6 +1,7 @@
New in v1.1.17 (????/??/??)
---------------------------
+Get makedist working on Windows. (Patch from Josh Nisly)
New in v1.1.16 (2008/06/17)
Index: dist/makedist
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/dist/makedist,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- dist/makedist 12 Nov 2006 07:24:36 -0000 1.28
+++ dist/makedist 23 Jun 2008 02:30:21 -0000 1.29
@@ -93,10 +93,10 @@
def MakeTar(specfiles):
"""Create rdiff-backup tar file"""
tardir = "rdiff-backup-%s" % Version
- tarfile = "rdiff-backup-%s.tar.gz" % Version
+ tarfilename = "rdiff-backup-%s.tar.gz" % Version
try:
os.lstat(tardir)
- os.system("rm -rf " + tardir)
+ shutil.rmtree(tardir)
except OSError: pass
os.mkdir(tardir)
for filename in ["CHANGELOG", "COPYING", "README",
@@ -104,7 +104,8 @@
SourceDir + "/cmodule.c",
SourceDir + "/_librsyncmodule.c",
DistDir + "/setup.py"] + specfiles:
- assert not os.system("cp %s %s" % (filename, tardir)), filename
+ shutil.copyfile(filename,
+ os.path.join(tardir,
os.path.basename(filename)))
os.mkdir(tardir+"/rdiff_backup")
for filename in ["eas_acls.py", "backup.py", "connection.py",
"compare.py",
@@ -118,8 +119,8 @@
"SetConnections.py", "static.py",
"statistics.py", "TempFile.py",
"Time.py",
"user_group.py"]:
- assert not os.system("cp %s/%s %s/rdiff_backup" %
- (SourceDir, filename,
tardir)), filename
+ shutil.copyfile(os.path.join(SourceDir, filename),
+ os.path.join(tardir,
"rdiff_backup", filename))
VersionedCopy("%s/Globals.py" % (SourceDir,),
"%s/rdiff_backup/Globals.py" % (tardir,))
@@ -132,9 +133,17 @@
os.chmod(os.path.join(tardir, "rdiff-backup"), 0644)
CopyMan(os.path.join(tardir, "rdiff-backup.1"), Version)
CopyMan(os.path.join(tardir, "rdiff-backup-statistics.1"), Version)
- os.system("tar -cvzf %s %s" % (tarfile, tardir))
+ if os.name != 'nt':
+ os.system("tar -cvzf %s %s" % (tarfilename, tardir))
+ else:
+ import tarfile
+ tar = tarfile.open(tarfilename, 'w:gz')
+ for path in os.listdir(tardir):
+ tar.add(os.path.join(tardir, path))
+ tar.close()
+
shutil.rmtree(tardir)
- return tarfile
+ return tarfilename
def MakeSpecFile():
"""Create spec file using spec template"""
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Rdiff-backup-commits] rdiff-backup CHANGELOG dist/makedist,
Andrew Ferguson <=