Modified the staging_install.py script to do something that it claims
to do but wasn't, which is to remove all the ".magicrc" files that
were created in the staging area but which don't belong in the
destination because they are temporary files. This fixes issue #204
on the github issue tracker for open_pdks.
diff --git a/VERSION b/VERSION
index 9643e09..727467d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.0.262
+1.0.263
diff --git a/common/staging_install.py b/common/staging_install.py
index ac977f7..a1be9a4 100755
--- a/common/staging_install.py
+++ b/common/staging_install.py
@@ -649,7 +649,13 @@
for libfile in libfiles:
filepath = libdir + '/' + libfile
if os.path.islink(filepath):
- continue
+ realpath = os.path.realpath(filepath)
+ if realpath.startswith(stagingdir):
+ if libfile == '.magicrc':
+ if debug:
+ print('Removing unused .magicrc file from' +
+ filepath)
+ os.remove(filepath)
elif libfile == 'sources.txt':
os.remove(filepath)
elif libfile == 'generate_magic.tcl':
@@ -671,7 +677,17 @@
for libfile in libfiles:
libfilepath = filepath + '/' + libfile
if os.path.islink(libfilepath):
- continue
+ # NOTE: This could be used to move symbolic links
+ # from staging to destination. At the moment there
+ # are none except the .magicrc file, which doesn't
+ # belong in the destination path.
+ realpath = os.path.realpath(libfilepath)
+ if realpath.startswith(stagingdir):
+ if libfile == '.magicrc':
+ if debug:
+ print('Removing unused .magicrc file ' +
+ 'from ' + libfilepath)
+ os.remove(libfilepath)
elif libfile == 'sources.txt':
os.remove(libfilepath)
elif libfile == 'generate_magic.tcl':
