From 362cd34bf345aebd355e4f0ebeb3775f7a65fa73 Mon Sep 17 00:00:00 2001 From: Bernd Wachter Date: Fri, 5 Apr 2013 22:54:45 +0300 Subject: [PATCH] Add output directory for kickstarter --- rpm/ssu.changes | 3 +++ rpm/ssu.spec | 2 +- ssuks/ssukickstarter.cpp | 8 +++++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/rpm/ssu.changes b/rpm/ssu.changes index b29886a..8fd09ab 100644 --- a/rpm/ssu.changes +++ b/rpm/ssu.changes @@ -1,3 +1,6 @@ +* Fri Apr 05 2013 Bernd Wachter - 0.31.1 +- Add output directory for kickstarter + * Thu Apr 04 2013 Bernd Wachter - 0.31 - Refactorize project files - Add Sandbox diff --git a/rpm/ssu.spec b/rpm/ssu.spec index e3c27c5..f878ba5 100644 --- a/rpm/ssu.spec +++ b/rpm/ssu.spec @@ -1,5 +1,5 @@ Name: ssu -Version: 0.31 +Version: 0.31.1 Release: 1 Summary: SSU enabler for RND Group: System/Base diff --git a/ssuks/ssukickstarter.cpp b/ssuks/ssukickstarter.cpp index f2724c2..d799729 100644 --- a/ssuks/ssukickstarter.cpp +++ b/ssuks/ssukickstarter.cpp @@ -220,8 +220,10 @@ bool SsuKickstarter::write(QString kickstart){ if (kickstart.isEmpty()){ if (repoOverride.contains("filename")){ - ks.setFileName(var.resolveString(repoOverride.value("filename"), - &repoOverride)); + + ks.setFileName(repoOverride.value("outputdir") + + var.resolveString(repoOverride.value("filename"), + &repoOverride)); ks.open(QIODevice::WriteOnly); } else { qerr << "No filename specified, and no default filename configured" << endl; @@ -230,7 +232,7 @@ bool SsuKickstarter::write(QString kickstart){ } else if (kickstart == "-") ks.open(stdout, QIODevice::WriteOnly); else { - ks.setFileName(kickstart); + ks.setFileName(repoOverride.value("outputdir") + kickstart); ks.open(QIODevice::WriteOnly); }