client/rhel
by Šimon Lukašík
client/rhel/rhnlib/test/01-get.py | 21 ++++++++++++++-------
1 file changed, 14 insertions(+), 7 deletions(-)
New commits:
commit b9a5c652969b6fce462402f83ffb4d021fae38f9
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Tue Apr 13 14:33:11 2010 +0200
Cleaning up, preparing for automatization (jhutar's patch)
diff --git a/client/rhel/rhnlib/test/01-get.py b/client/rhel/rhnlib/test/01-get.py
index 7258edd..d32fd1d 100644
--- a/client/rhel/rhnlib/test/01-get.py
+++ b/client/rhel/rhnlib/test/01-get.py
@@ -9,14 +9,17 @@ sys.path.append('..')
from rhn.rpclib import Server, GETServer
SERVER = "http://xmlrpc.rhn.redhat.com/XMLRPC"
-#SERVER = "http://xmlrpc.rhn.webqa.redhat.com/XMLRPC"
+system_id_file = "/etc/sysconfig/rhn/systemid"
+try:
+ SERVER = "http://%s/XMLRPC" % sys.argv[1]
+ system_id_file = sys.argv[2]
+except:
+ pass
+print "SERVER = %s" % SERVER
+print "system_id_file = %s" % system_id_file
s = Server(SERVER)
-if len(sys.argv) > 1:
- systemid_file = sys.argv[1]
-else:
- systemid_file = "/etc/sysconfig/rhn/systemid"
-sysid = open(systemid_file).read()
+sysid = open(system_id_file).read()
dict = s.up2date.login(sysid)
print dict
@@ -32,9 +35,13 @@ print l
# Package download
package = l[0]
+print "PACKAGE TO DOWNLOAD: %s %s %s %s" % (package[0], package[1], package[2], package[4])
filename = "%s-%s-%s.%s.rpm" % (package[0], package[1], package[2],
package[4])
fd = sg.getPackage(channel_name, filename)
-f = open("/tmp/test-get-%s" % filename, "w+")
+f_name = "/tmp/test-get-%s" % filename
+f = open(f_name, "w+")
f.write(fd.read())
f.close()
+print "PACKAGE DOWNLOADED AS: %s" % f_name
+
14 years, 1 month
Changes to 'refs/tags/spacewalk-certs-tools-0.9.2-1'
by Jan Pazdziora
Tag 'spacewalk-certs-tools-0.9.2-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2010-04-13 12:19 +0000
Tagging package [spacewalk-certs-tools] version [0.9.2-1] in directory [spacewalk/certs-tools/].
Changes since spacewalk-schema-0.9.5-1:
Jan Pazdziora (7):
maketemp not called in these files, removing from import.
make_temp_file not called here, removing from import.
Replace spacewalk.common.fileutils.maketemp with tempfile.mkstemp.
Replace make_temp_file with direct tempfile.TemporaryFile.
With previous commits, spacewalk.common.fileutils' make_temp_file and maketemp are no longer needed.
Just use os.path.abspath in cleanupAbsPath.
Automatic commit of package [spacewalk-certs-tools] release [0.9.2-1].
---
backend/satellite_tools/geniso.py | 6 -
backend/satellite_tools/rhn_satellite_activate.py | 4
backend/server/handlers/config_mgmt/rhn_config_management.py | 5 -
backend/server/importlib/importLib.py | 2
backend/spacewalk/common/fileutils.py | 45 -----------
rel-eng/packages/spacewalk-certs-tools | 2
spacewalk/certs-tools/client_config_update.py | 8 -
spacewalk/certs-tools/rhn_bootstrap.py | 2
spacewalk/certs-tools/rhn_ssl_tool.py | 2
spacewalk/certs-tools/spacewalk-certs-tools.spec | 6 +
10 files changed, 24 insertions(+), 58 deletions(-)
---
14 years, 1 month
rel-eng/packages spacewalk/certs-tools
by Jan Pazdziora
rel-eng/packages/spacewalk-certs-tools | 2 +-
spacewalk/certs-tools/spacewalk-certs-tools.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit fae95394d33be861f07654fc0d4335d7a5f7a34f
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Apr 13 14:19:09 2010 +0200
Automatic commit of package [spacewalk-certs-tools] release [0.9.2-1].
diff --git a/rel-eng/packages/spacewalk-certs-tools b/rel-eng/packages/spacewalk-certs-tools
index 2c42bb0..b930510 100644
--- a/rel-eng/packages/spacewalk-certs-tools
+++ b/rel-eng/packages/spacewalk-certs-tools
@@ -1 +1 @@
-0.9.1-1 spacewalk/certs-tools/
+0.9.2-1 spacewalk/certs-tools/
diff --git a/spacewalk/certs-tools/spacewalk-certs-tools.spec b/spacewalk/certs-tools/spacewalk-certs-tools.spec
index a4c7586..81d790b 100644
--- a/spacewalk/certs-tools/spacewalk-certs-tools.spec
+++ b/spacewalk/certs-tools/spacewalk-certs-tools.spec
@@ -2,7 +2,7 @@ Name: spacewalk-certs-tools
Summary: Spacewalk SSL Key/Cert Tool
Group: Applications/Internet
License: GPLv2 and Python
-Version: 0.9.1
+Version: 0.9.2
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -56,6 +56,10 @@ rm -rf $RPM_BUILD_ROOT
%{_var}/www/html/pub/bootstrap/client_config_update.py*
%changelog
+* Tue Apr 13 2010 Jan Pazdziora 0.9.2-1
+- Use tempfile.TemporaryFile and os.path.abspath, to avoid the need for
+ spacewalk.common.fileutils in client_config_update.py.
+
* Wed Feb 24 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.9.1-1
- 567271 - fixed import
14 years, 1 month
spacewalk/certs-tools
by Jan Pazdziora
spacewalk/certs-tools/client_config_update.py | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit fb9c7b51f4654a1112d8114d6ac983418bd73a40
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Apr 13 14:13:06 2010 +0200
Just use os.path.abspath in cleanupAbsPath.
diff --git a/spacewalk/certs-tools/client_config_update.py b/spacewalk/certs-tools/client_config_update.py
index 05c65e4..e595b62 100755
--- a/spacewalk/certs-tools/client_config_update.py
+++ b/spacewalk/certs-tools/client_config_update.py
@@ -66,7 +66,6 @@ import os
import sys
import time
import string
-from spacewalk.common.fileutils import cleanupAbsPath
import tempfile
DEFAULT_CLIENT_CONFIG_OVERRIDES = 'client-config-overrides.txt'
@@ -191,8 +190,8 @@ examples:
msg = "ERROR: exactly two arguments are required, see --help"
raise TypeError(msg)
- configFilename = cleanupAbsPath(sys.argv[1])
- newMappings = cleanupAbsPath(sys.argv[2])
+ configFilename = os.path.abspath(sys.argv[1])
+ newMappings = os.path.abspath(sys.argv[2])
if not os.path.exists(configFilename):
msg = ("ERROR: filename to alter (1st argument), does not exist:\n"
14 years, 1 month
4 commits - backend/satellite_tools backend/server backend/spacewalk spacewalk/certs-tools
by Jan Pazdziora
backend/satellite_tools/geniso.py | 6 -
backend/satellite_tools/rhn_satellite_activate.py | 4
backend/server/handlers/config_mgmt/rhn_config_management.py | 5 -
backend/spacewalk/common/fileutils.py | 45 -----------
spacewalk/certs-tools/client_config_update.py | 5 -
spacewalk/certs-tools/rhn_bootstrap.py | 2
6 files changed, 15 insertions(+), 52 deletions(-)
New commits:
commit e95a0cd265f78be7726d8c64f6a64712851e7c22
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Apr 13 14:07:29 2010 +0200
With previous commits, spacewalk.common.fileutils' make_temp_file and maketemp are no longer needed.
diff --git a/backend/spacewalk/common/fileutils.py b/backend/spacewalk/common/fileutils.py
index 5a643ef..51e9db4 100644
--- a/backend/spacewalk/common/fileutils.py
+++ b/backend/spacewalk/common/fileutils.py
@@ -62,46 +62,6 @@ def cleanupNormPath(path, dotYN=0):
return path
-def maketemp(prefix):
- """ Creates a temporary file (guaranteed to be new), using the
- specified prefix.
- Returns the filename and an open file descriptor (low-level)
- """
-
- filename = "%s-%s-%.8f" % (prefix, os.getpid(), time.time())
- tries = 10
- while tries > 0:
- tries = tries - 1
- try:
- fd = os.open(filename, os.O_RDWR | os.O_CREAT | os.O_EXCL, 0600)
- except OSError, e:
- if e.errno != 17:
- raise e
- # File already exists
- filename = "%s-%.8f" % (filename, time.time())
- else:
- break
- else:
- raise OSError("Could not create temp file")
-
- return filename, fd
-
-
-def make_temp_file(prefix):
- """Creates a temporary file stream (returns an open file object)
-
- Returns a read/write stream pointing to a file that goes away once the
- stream is closed
- """
-
- filename, fd = maketemp(prefix)
-
- os.unlink(filename)
- # Since maketemp returns a freshly created file, we can skip the truncation
- # part (w+); r+ should do just fine
- return os.fdopen(fd, "r+b")
-
-
def rotateFile(filepath, depth=5, suffix='.', verbosity=0):
""" backup/rotate a file
depth (-1==no limit) refers to num. of backups (rotations) to keep.
commit 86cd51b56a20b578abfc95368c4f43c7ac041108
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Apr 13 14:06:20 2010 +0200
Replace make_temp_file with direct tempfile.TemporaryFile.
diff --git a/backend/spacewalk/common/fileutils.py b/backend/spacewalk/common/fileutils.py
index b2b89a3..5a643ef 100644
--- a/backend/spacewalk/common/fileutils.py
+++ b/backend/spacewalk/common/fileutils.py
@@ -23,6 +23,7 @@ import shutil
import string
import subprocess
import select
+import tempfile
from checksum import getFileChecksum
@@ -217,8 +218,8 @@ def rhn_popen(cmd, progressCallback=None, bufferSize=16384, outputLog=None):
c.stdin.close()
# Create two temporary streams to hold the info from stdout and stderr
- child_out = make_temp_file("/tmp/my-popen-")
- child_err = make_temp_file("/tmp/my-popen-")
+ child_out = tempfile.TemporaryFile(prefix = '/tmp/my-popen-', mode = 'r+b')
+ child_err = tempfile.TemporaryFile(prefix = '/tmp/my-popen-', mode = 'r+b')
# Map the input file descriptor with the temporary (output) one
fd_mappings = [(c.stdout, child_out), (c.stderr, child_err)]
diff --git a/spacewalk/certs-tools/client_config_update.py b/spacewalk/certs-tools/client_config_update.py
index e839e7e..05c65e4 100755
--- a/spacewalk/certs-tools/client_config_update.py
+++ b/spacewalk/certs-tools/client_config_update.py
@@ -66,7 +66,8 @@ import os
import sys
import time
import string
-from spacewalk.common.fileutils import cleanupAbsPath, make_temp_file
+from spacewalk.common.fileutils import cleanupAbsPath
+import tempfile
DEFAULT_CLIENT_CONFIG_OVERRIDES = 'client-config-overrides.txt'
@@ -126,7 +127,7 @@ def dumpConfigFile(configFile):
def mapNewSettings(configFile, dnew):
- fo = make_temp_file('/tmp/client-config-overrides-')
+ fo = tempfile.TemporaryFile(prefix = '/tmp/client-config-overrides-', mode = 'r+b')
fin = open(configFile, 'rb')
changedYN = 0
commit 974f6fba1126832a5c843d8b07a64c907bbfdb08
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Apr 13 13:51:58 2010 +0200
Replace spacewalk.common.fileutils.maketemp with tempfile.mkstemp.
diff --git a/backend/satellite_tools/geniso.py b/backend/satellite_tools/geniso.py
index be63c4e..33f1f17 100644
--- a/backend/satellite_tools/geniso.py
+++ b/backend/satellite_tools/geniso.py
@@ -22,7 +22,7 @@ import string
from stat import ST_SIZE
from optparse import Option, OptionParser
-from spacewalk.common.fileutils import maketemp
+import tempfile
MOUNT_POINT = '/tmp'
IMAGE_SIZE = "630M"
@@ -109,7 +109,7 @@ def main(arglist):
cdcount = len(cds)
# Create an empty temp file
- empty_file_path, fd = maketemp("/tmp/empty.file")
+ fd, empty_file_path = tempfile.mkstemp(dir = '/tmp', prefix = 'empty.file-')
os.close(fd)
# command-line template
@@ -125,7 +125,7 @@ def main(arglist):
# options.type, options.version, options.release, i+1)
# Create a temp file to store the path specs
- pathfiles, pathfiles_fd = maketemp("/tmp/geniso")
+ pathfiles_fd, pathfiles = tempfile.mkstemp(dir = '/tmp', prefix = 'geniso-')
# Command-line options; the keys are supposed to start with a dash
opts = {
diff --git a/backend/satellite_tools/rhn_satellite_activate.py b/backend/satellite_tools/rhn_satellite_activate.py
index e0d77b0..b347e4b 100644
--- a/backend/satellite_tools/rhn_satellite_activate.py
+++ b/backend/satellite_tools/rhn_satellite_activate.py
@@ -38,6 +38,8 @@ from server import rhnSQL
from server.rhnServer import satellite_cert
from spacewalk.common import fileutils
+import tempfile
+
## local imports
import sync_handlers
import satCerts
@@ -116,7 +118,7 @@ def validateSatCert(certFilename, verbosity=0):
# copy cert to temp location (it may be gzipped which validate-sat-cert.pl
# doesn't like).
- certTmpFile, fd = fileutils.maketemp(DEFAULT_RHN_CERT_LOCATION)
+ fd, certTmpFile = tempfile.mkstemp(prefix = DEFAULT_RHN_CERT_LOCATION + '-')
fo = os.fdopen(fd, 'wb')
fo.write(string.strip(openGzippedFile(certFilename).read()))
fo.flush()
diff --git a/backend/server/handlers/config_mgmt/rhn_config_management.py b/backend/server/handlers/config_mgmt/rhn_config_management.py
index 7387b0e..0f8595d 100644
--- a/backend/server/handlers/config_mgmt/rhn_config_management.py
+++ b/backend/server/handlers/config_mgmt/rhn_config_management.py
@@ -22,7 +22,6 @@ import os
from common import rhnFault, log_debug
from server import rhnSQL, configFilesHandler
-from spacewalk.common.fileutils import maketemp
class ConfigManagement(configFilesHandler.ConfigFilesHandler):
def __init__(self):
@@ -474,7 +473,7 @@ class ConfigManagement(configFilesHandler.ConfigFilesHandler):
# seems to be invalid (bug 151220)
# Empty files or directories may have NULL instead of lobs
- filename_src, fd = maketemp("/tmp/rhncfg")
+ fd, filename_src = tempfile.mkstemp(prefix = '/tmp/rhncfg-')
fc_lob = fsrc['file_contents']
if fc_lob:
os.write(fd, rhnSQL.read_lob(fc_lob))
@@ -495,7 +494,7 @@ class ConfigManagement(configFilesHandler.ConfigFilesHandler):
"binary data" % (path, revision_dst),
explain=0)
- filename_dst, fd = maketemp("/tmp/rhncfg")
+ fd, filename_dst = tempfile.mkstemp(prefix = '/tmp/rhncfg-')
fc_lob = fdst['file_contents']
if fc_lob:
os.write(fd, rhnSQL.read_lob(fc_lob))
commit b9bb343d8933b4367be46e295a5374133eafd7af
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Apr 13 13:21:06 2010 +0200
make_temp_file not called here, removing from import.
diff --git a/spacewalk/certs-tools/rhn_bootstrap.py b/spacewalk/certs-tools/rhn_bootstrap.py
index 14be341..6e50a2c 100644
--- a/spacewalk/certs-tools/rhn_bootstrap.py
+++ b/spacewalk/certs-tools/rhn_bootstrap.py
@@ -41,7 +41,7 @@ from rhn_bootstrap_strings import \
getCorpCACertSh, getRegistrationSh, getUp2dateTheBoxSh, \
getAllowConfigManagement, getAllowRemoteCommands
from sslToolConfig import CA_CRT_NAME, CA_CRT_RPM_NAME
-from spacewalk.common.fileutils import make_temp_file, rotateFile, cleanupAbsPath
+from spacewalk.common.fileutils import rotateFile, cleanupAbsPath
from spacewalk.common.checksum import getFileChecksum
## GLOBALS
14 years, 1 month
backend/server spacewalk/certs-tools
by Jan Pazdziora
backend/server/importlib/importLib.py | 2 +-
spacewalk/certs-tools/rhn_ssl_tool.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 0c8564428eff77c2c4cce602fd900f9d085b8009
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Apr 13 13:19:15 2010 +0200
maketemp not called in these files, removing from import.
diff --git a/backend/server/importlib/importLib.py b/backend/server/importlib/importLib.py
index 982010d..423f8af 100644
--- a/backend/server/importlib/importLib.py
+++ b/backend/server/importlib/importLib.py
@@ -27,7 +27,7 @@ from common import log_debug
from server.rhnLib import get_package_path
from spacewalk.common import rhn_mpm
from spacewalk.common.checksum import getFileChecksum
-from spacewalk.common.fileutils import maketemp, createPath, setPermsPath
+from spacewalk.common.fileutils import createPath, setPermsPath
# no-op class, used to define the type of an attribute
class DateType:
diff --git a/spacewalk/certs-tools/rhn_ssl_tool.py b/spacewalk/certs-tools/rhn_ssl_tool.py
index b656f08..c322fed 100755
--- a/spacewalk/certs-tools/rhn_ssl_tool.py
+++ b/spacewalk/certs-tools/rhn_ssl_tool.py
@@ -50,7 +50,7 @@ from sslToolLib import RhnSslToolException, \
gendir, chdir, getMachineName, fixSerial, TempDir, parseRPMFilename, \
errnoGeneralError, errnoSuccess
-from spacewalk.common.fileutils import rotateFile, rhn_popen, cleanupAbsPath, maketemp
+from spacewalk.common.fileutils import rotateFile, rhn_popen, cleanupAbsPath
from spacewalk.common.rhn_rpm import hdrLabelCompare, sortRPMs, get_package_header, \
getInstalledHeader
14 years, 1 month
Changes to 'refs/tags/spacewalk-schema-0.9.5-1'
by Jan Pazdziora
Tag 'spacewalk-schema-0.9.5-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2010-04-13 10:08 +0000
Tagging package [spacewalk-schema] version [0.9.5-1] in directory [schema/spacewalk/].
Changes since spacewalk-schema-0.9.4-1:
Jan Pazdziora (2):
If chameleon fails, just copy over the original.
Automatic commit of package [spacewalk-schema] release [0.9.5-1].
Michael Mraka (2):
cleaning old stuff
deploy-tree-local.sh has been replaced by chameleon
Miroslav Suchý (1):
578738 - obsolete all archs - we are noarch now
---
monitoring/rhnmd/rhnmd.spec | 5
rel-eng/packages/spacewalk-schema | 2
schema/HOWTO | 6
schema/spacewalk/common/Makefile | 2
schema/spacewalk/spacewalk-schema.spec | 5
schema/util/bad_cfp_members.sql | 27 --
schema/util/dedupe-email-addresses.py | 20 -
schema/util/deploy-tree-local.sh | 10
schema/util/dumper/dumper.py | 80 ------
schema/util/dumper/dumper_rhnPackageEVR.py | 77 -----
schema/util/explain.sql | 30 --
schema/util/explain_plan_for_queries.py | 333 -------------------------
schema/util/find_cascade_delete_triggers.sql | 22 -
schema/util/find_noaction_referrers.sql | 20 -
schema/util/find_references.sql | 44 ---
schema/util/find_unindexed_fks.sql | 45 ---
schema/util/findidx.sql | 11
schema/util/functions.sql | 111 --------
schema/util/generate_constraint_fixes.sql | 23 -
schema/util/idx_dump.sql | 39 --
schema/util/make-rebuilds.sql | 17 -
schema/util/makeTableColumnMap.py | 100 -------
schema/util/pjexplain.sql | 18 -
schema/util/schema_dump.sql | 73 -----
schema/util/scripts/dump_errata_maps.sql | 18 -
schema/util/scripts/fixaction.py | 84 ------
schema/util/scripts/hwreport.sql | 107 --------
schema/util/scripts/migrate_parentchannel.sql | 24 -
schema/util/scripts/multiorg.sql | 9
schema/util/scripts/ora-df.sql | 30 --
schema/util/scripts/package-profile.sql | 26 -
schema/util/scripts/server-partition-query.sql | 22 -
schema/util/scripts/stress.pl | 42 ---
schema/util/show-proc.sql | 4
schema/util/show_constraints.sql | 21 -
schema/util/show_triggers.sql | 13
schema/util/user_2_org_admin.sql | 20 -
37 files changed, 8 insertions(+), 1532 deletions(-)
---
14 years, 1 month
rel-eng/packages schema/spacewalk
by Jan Pazdziora
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit be3f7b94c3722a1776a2591ba27f16c3e64d3710
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Apr 13 12:08:32 2010 +0200
Automatic commit of package [spacewalk-schema] release [0.9.5-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index d8c81ad..0839c55 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-0.9.4-1 schema/spacewalk/
+0.9.5-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index a2d0ce2..1214290 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -2,7 +2,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 0.9.4
+Version: 0.9.5
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-schema-upgrade*
%changelog
+* Tue Apr 13 2010 Jan Pazdziora 0.9.5-1
+- Fix Makefile to workaround chameleon failing.
+
* Mon Apr 12 2010 Miroslav Suchý <msuchy(a)redhat.com> 0.9.4-1
- Fix db schema for debian support (ukas.durfina(a)gmail.com)
- Retrieve the rhn_schedules(recid) instead of using the hardcoded value of 1 (jpazdziora(a)redhat.com)
14 years, 1 month
schema/spacewalk
by Jan Pazdziora
schema/spacewalk/common/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit dee8451bd9a3384e6d042b4e19cd8c7bfc5c4c64
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Apr 13 11:56:20 2010 +0200
If chameleon fails, just copy over the original.
This is a workaround for the fact that commit
4377bb4578ab4602c744e526c4fb8f2ef2875bf8
does not get handled by chameleon correctly (no SELECTs supported?).
diff --git a/schema/spacewalk/common/Makefile b/schema/spacewalk/common/Makefile
index 81baaba..cd44e7c 100644
--- a/schema/spacewalk/common/Makefile
+++ b/schema/spacewalk/common/Makefile
@@ -38,7 +38,7 @@ files : $(FILES)
@$(RMTRASH)
%.sql : %.cql
- $(CHAMELEON) -o $@ $^
+ $(CHAMELEON) -o $@ $^ || cp $^ $@
links :
@$(RMLINKS)
14 years, 1 month
schema/HOWTO
by Michael Mraka
schema/HOWTO | 6 ------
1 file changed, 6 deletions(-)
New commits:
commit e87d1394fa386183fcaee17788ba32227aa0492b
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Apr 13 11:39:39 2010 +0200
deploy-tree-local.sh has been replaced by chameleon
diff --git a/schema/HOWTO b/schema/HOWTO
index c0ab542..4fd54dd 100644
--- a/schema/HOWTO
+++ b/schema/HOWTO
@@ -1,9 +1,3 @@
-# $Id#
-
-* How to run SQL scripts from this tree:
-./deploy-tree-local.sh
-cd /tmp/satcon-local-deploy/
-sqlplus foo/bar@baz @rhn/tables/rhnChannel.sql
* How to create the spacewalk schema:
cd spacewalk
14 years, 1 month