diff options
| author | owsla <owsla@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2008-06-23 02:30:21 +0000 |
|---|---|---|
| committer | owsla <owsla@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2008-06-23 02:30:21 +0000 |
| commit | 16cb4fb3df42c47cbbf736555e3d3d46cc3c7e7e (patch) | |
| tree | 33ad599d030cdbabf187f2e154112caf27c08cd7 | |
| parent | 49aae32fece06bddb7e996b91ef738694dec8705 (diff) | |
| download | rdiff-backup-16cb4fb3df42c47cbbf736555e3d3d46cc3c7e7e.tar.gz | |
Get makedist working on Windows. (Patch from Josh Nisly)
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@900 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
| -rw-r--r-- | rdiff-backup/CHANGELOG | 1 | ||||
| -rwxr-xr-x | rdiff-backup/dist/makedist | 23 |
2 files changed, 17 insertions, 7 deletions
diff --git a/rdiff-backup/CHANGELOG b/rdiff-backup/CHANGELOG index ef84677..1e1c1a4 100644 --- a/rdiff-backup/CHANGELOG +++ b/rdiff-backup/CHANGELOG @@ -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) diff --git a/rdiff-backup/dist/makedist b/rdiff-backup/dist/makedist index defb6f6..ff2953c 100755 --- a/rdiff-backup/dist/makedist +++ b/rdiff-backup/dist/makedist @@ -93,10 +93,10 @@ def VersionedCopy(source, dest, munge_date = 0): 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 @@ def MakeTar(specfiles): 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 @@ def MakeTar(specfiles): "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 @@ def MakeTar(specfiles): 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""" |