Dima Kuznetsov has uploaded a new change for review.
Change subject: Remove orphaned files ......................................................................
Remove orphaned files
This patch removes files than are neither mentioned in any code nor shipped int the dist tar file.
Change-Id: Ibce1a6c8044fdeae49d6f563a90383a58bf9b170 Signed-off-by: Dima Kuznetsov dkuznets@redhat.com --- D vdsm/substitute_constants.py D vdsm/write-net-config 2 files changed, 0 insertions(+), 62 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/24/35724/1
diff --git a/vdsm/substitute_constants.py b/vdsm/substitute_constants.py deleted file mode 100644 index 6cecb5c..0000000 --- a/vdsm/substitute_constants.py +++ /dev/null @@ -1,53 +0,0 @@ -#!/usr/bin/python -# -# Copyright 2011 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# - -import sys -import re - -from vdsm import constants - - -def replacement(m): - s = m.group() - return getattr(constants, 'EXT_' + s[1:-1], - getattr(constants, s[1:-1], s)) - -if len(sys.argv) <= 1: - print """usage: %s filename... - -substitute all @CONSTANT@s in filename. -""" % sys.argv[0] - -for fname in sys.argv[1:]: - if fname == '-': - f = sys.stdin - else: - f = open(fname) - - s = f.read() - r = re.sub('@[^@\n]*@', replacement, s) - - if fname == '-': - f = sys.stdout - else: - f = open(fname, 'w') - - f.write(r) diff --git a/vdsm/write-net-config b/vdsm/write-net-config deleted file mode 100755 index b77d892..0000000 --- a/vdsm/write-net-config +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -# -# little wrapper to let vdsm write to root-owned /etc/sysconfig/network-scripts -# (and to there only) - -case "$1" in - /etc/sysconfig/network-scripts/ifcfg-*) cat > "$1";; - *) echo skipping $1 1>&2 ;; -esac
Dan Kenigsberg has posted comments on this change.
Change subject: Remove orphaned files ......................................................................
Patch Set 1: Code-Review+2
(2 comments)
http://gerrit.ovirt.org/#/c/35724/1/vdsm/substitute_constants.py File vdsm/substitute_constants.py:
Line 1 should have been removed in 73a70478364b256f94515ba071261d1b6833220e
http://gerrit.ovirt.org/#/c/35724/1/vdsm/write-net-config File vdsm/write-net-config:
Line 1 should have been dropped in e6e73c7e173cea3398ad2d2a205e084351cb479a
oVirt Jenkins CI Server has posted comments on this change.
Change subject: Remove orphaned files ......................................................................
Patch Set 1:
Build Failed
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/13793/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/13004/ : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/13956/ : FAILURE
Dima Kuznetsov has posted comments on this change.
Change subject: Remove orphaned files ......................................................................
Patch Set 1: Verified+1
git grep $FILENAME shows nothing
Yeela Kaplan has posted comments on this change.
Change subject: Remove orphaned files ......................................................................
Patch Set 1: Code-Review+1
Dan Kenigsberg has submitted this change and it was merged.
Change subject: Remove orphaned files ......................................................................
Remove orphaned files
This patch removes files than are neither mentioned in any code nor shipped int the dist tar file.
Change-Id: Ibce1a6c8044fdeae49d6f563a90383a58bf9b170 Signed-off-by: Dima Kuznetsov dkuznets@redhat.com Reviewed-on: http://gerrit.ovirt.org/35724 Reviewed-by: Dan Kenigsberg danken@redhat.com Reviewed-by: Yeela Kaplan ykaplan@redhat.com --- D vdsm/substitute_constants.py D vdsm/write-net-config 2 files changed, 0 insertions(+), 62 deletions(-)
Approvals: Yeela Kaplan: Looks good to me, but someone else must approve Dima Kuznetsov: Verified Dan Kenigsberg: Looks good to me, approved
oVirt Jenkins CI Server has posted comments on this change.
Change subject: Remove orphaned files ......................................................................
Patch Set 2:
Build Failed
http://jenkins.ovirt.org/job/vdsm_master-libfapi_create-rpms-el6-x86_64_merg... : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_create-rpms-fc21-x86_64_merged/246/ : FAILURE
http://jenkins.ovirt.org/job/vdsm_master-libfapi_create-rpms-fc20-x86_64_mer... : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_create-rpms_merged_test_debug/463/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master-libfapi_create-rpms-el7-x86_64_merg... : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_create-rpms-fc20-x86_64_merged/261/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit-tests_merged/4255/ : ABORTED
http://jenkins.ovirt.org/job/vdsm_master_create-rpms-el6-x86_64_merged/268/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_create-rpms-el7-x86_64_merged/270/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master-libfapi_create-rpms-fc21-x86_64_mer... : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_verify-error-codes_merged/6093/ : SUCCESS
vdsm-patches@lists.fedorahosted.org