summaryrefslogtreecommitdiff
path: root/components
diff options
context:
space:
mode:
authorDaniel Baumann <mail@daniel-baumann.ch>2013-11-10 08:06:36 +0100
committerDaniel Baumann <mail@daniel-baumann.ch>2013-11-10 08:06:45 +0100
commitaaa3b7382f599f53bfe3f86bea021f72a8144b6a (patch)
tree2c0f6848a901d4fc55b7f443f4279ad928b84381 /components
parente9b568293663f80db574765d89ab631c915f6131 (diff)
downloadvyos-live-build-aaa3b7382f599f53bfe3f86bea021f72a8144b6a.tar.gz
vyos-live-build-aaa3b7382f599f53bfe3f86bea021f72a8144b6a.zip
Correcting a few copy/paste errors in *-includes python stubs.
Diffstat (limited to 'components')
-rwxr-xr-xcomponents/binary-includes6
-rwxr-xr-xcomponents/bootstrap-includes6
-rwxr-xr-xcomponents/chroot-includes6
-rwxr-xr-xcomponents/source-includes6
4 files changed, 4 insertions, 20 deletions
diff --git a/components/binary-includes b/components/binary-includes
index bdf238ff8..8e19e822d 100755
--- a/components/binary-includes
+++ b/components/binary-includes
@@ -81,16 +81,12 @@ def main():
# process includes
if glob.glob('config/includes/*') or glob.glob('config/includes/.*'):
- hooks = glob.glob('config/includes/*') + glob.glob('config/includes/.*')
-
if verbose:
print('I: Copying config/includes to binary')
cpio = subprocess.call('cd config/includes && find . | cpio -dmpu --no-preserve-owner ../../binary', shell=True)
- if glob.glob('config/includes.binary/*') and not glob.glob('config/includes.binary/.*'):
- hooks = glob.glob('config/includes.binary/*') + glob.glob('config/includes.binary/.*')
-
+ if glob.glob('config/includes.binary/*') or glob.glob('config/includes.binary/.*'):
if verbose:
print('I: Copying config/includes.binary to binary')
diff --git a/components/bootstrap-includes b/components/bootstrap-includes
index 57cecb5e2..640b2b564 100755
--- a/components/bootstrap-includes
+++ b/components/bootstrap-includes
@@ -80,16 +80,12 @@ def main():
# process includes
if glob.glob('config/includes/*') or glob.glob('config/includes/.*'):
- hooks = glob.glob('config/includes/*') + glob.glob('config/includes/.*')
-
if verbose:
print('I: Copying config/includes to chroot')
cpio = subprocess.call('cd config/includes && find . | cpio -dmpu --no-preserve-owner ../../chroot', shell=True)
- if glob.glob('config/includes.bootstrap/*') and not glob.glob('config/includes.bootstrap/.*'):
- hooks = glob.glob('config/includes.bootstrap/*') + glob.glob('config/includes.bootstrap/.*')
-
+ if glob.glob('config/includes.bootstrap/*') or glob.glob('config/includes.bootstrap/.*'):
if verbose:
print('I: Copying config/includes.bootstrap to chroot')
diff --git a/components/chroot-includes b/components/chroot-includes
index 9e73157e8..8d908cb5a 100755
--- a/components/chroot-includes
+++ b/components/chroot-includes
@@ -80,16 +80,12 @@ def main():
# process includes
if glob.glob('config/includes/*') or glob.glob('config/includes/.*'):
- hooks = glob.glob('config/includes/*') + glob.glob('config/includes/.*')
-
if verbose:
print('I: Copying config/includes to chroot')
cpio = subprocess.call('cd config/includes && find . | cpio -dmpu --no-preserve-owner ../../chroot', shell=True)
- if glob.glob('config/includes.chroot/*') and not glob.glob('config/includes.chroot/.*'):
- hooks = glob.glob('config/includes.chroot/*') + glob.glob('config/includes.chroot/.*')
-
+ if glob.glob('config/includes.chroot/*') or glob.glob('config/includes.chroot/.*'):
if verbose:
print('I: Copying config/includes.chroot to chroot')
diff --git a/components/source-includes b/components/source-includes
index f1e022d8d..9155970ea 100755
--- a/components/source-includes
+++ b/components/source-includes
@@ -81,16 +81,12 @@ def main():
# process includes
if glob.glob('config/includes/*') or glob.glob('config/includes/.*'):
- hooks = glob.glob('config/includes/*') + glob.glob('config/includes/.*')
-
if verbose:
print('I: Copying config/includes to source')
cpio = subprocess.call('cd config/includes && find . | cpio -dmpu --no-preserve-owner ../../source', shell=True)
- if glob.glob('config/includes.source/*') and not glob.glob('config/includes.source/.*'):
- hooks = glob.glob('config/includes.source/*') + glob.glob('config/includes.source/.*')
-
+ if glob.glob('config/includes.source/*') or glob.glob('config/includes.source/.*'):
if verbose:
print('I: Copying config/includes.source to source')