[firmware-nonfree] 03/05: Add per-file copy flag, allowing replacement of upstream symlinks with copies

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository firmware-nonfree.

commit c734938a6054715b50151c21e63f3d05a015feb2
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Wed Dec 14 03:51:41 2016 +0000

    Add per-file copy flag, allowing replacement of upstream symlinks with copies
---
 debian/bin/gencontrol.py    | 3 ++-
 debian/lib/python/config.py | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index 4664585..491bbe3 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -253,7 +253,8 @@ class GenControl(debian_linux.gencontrol.Gencontrol):
         # Take all the other files from upstream
         for f in files_orig:
             if f not in files_real and f not in links:
-                if os.path.islink(f):
+                if os.path.islink(f) and \
+                   not self.config.get(('base', package, f), {}).get('copy'):
                     links[f] = os.readlink(f)
                 elif os.path.isfile(f):
                     files_real[f] = f, f, None
diff --git a/debian/lib/python/config.py b/debian/lib/python/config.py
index 62ebbd7..fc18629 100644
--- a/debian/lib/python/config.py
+++ b/debian/lib/python/config.py
@@ -1,4 +1,4 @@
-from debian_linux.config import ConfigParser, SchemaItemList
+from debian_linux.config import ConfigParser, SchemaItemList, SchemaItemBoolean
 
 class Config(dict):
     config_name = "defines"
@@ -16,6 +16,7 @@ class Config(dict):
         'base': {
             'files': SchemaItemList(),
             'support': SchemaItemList(),
+            'copy': SchemaItemBoolean(),
         }
     }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/firmware-nonfree.git